pep/xmpp-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

minidom: Move compare_ns out of NamespaceSet into NSChoice

Browse source 
Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
This commit is contained in:
Maxime “pep” Buquet 2019-11-09 12:45:31 +01:00
parent 28faee8408
commit 8042d6ea23
Signed by: pep
GPG key ID: DEDA74AEECA9D0F2
1 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
minidom-rs/src/namespace_set.rs
View file

@ -22,6 +22,19 @@ impl<'a> From<&'a str> for NSChoice<'a> {
} }
} }
impl<'a> NSChoice<'a> {
fn compare(&self, ns: Option<&str>) -> bool {
match (ns, &self) {
(None, NSChoice::None) | (None, NSChoice::Any) => true,
(None, NSChoice::OneOf(_)) | (None, NSChoice::AnyOf(_)) => false,
(Some(_), NSChoice::None) => false,
(Some(_), NSChoice::Any) => true,
(Some(ns), NSChoice::OneOf(wanted_ns)) => &ns == wanted_ns,
(Some(ns), NSChoice::AnyOf(wanted_nss)) => wanted_nss.iter().any(|w| &ns == w),
}
}
}
#[derive(Clone, PartialEq, Eq)] #[derive(Clone, PartialEq, Eq)]
pub struct NamespaceSet { pub struct NamespaceSet {
parent: RefCell<Option<Rc<NamespaceSet>>>, parent: RefCell<Option<Rc<NamespaceSet>>>,
@ -70,22 +83,11 @@ impl NamespaceSet {
} }
} }
fn compare_ns<'a>(&self, ns: Option<&str>, wanted_ns: NSChoice<'a>) -> bool {
match (ns, wanted_ns) {
(None, NSChoice::None) | (None, NSChoice::Any) => true,
(None, NSChoice::OneOf(_)) | (None, NSChoice::AnyOf(_)) => false,
(Some(_), NSChoice::None) => false,
(Some(_), NSChoice::Any) => true,
(Some(ns), NSChoice::OneOf(wanted_ns)) => ns == wanted_ns,
(Some(ns), NSChoice::AnyOf(wanted_nss)) => wanted_nss.iter().any(|w| &ns == w),
}
}
pub fn has<'a, NS: Into<NSChoice<'a>>>(&self, prefix: &Option<String>, wanted_ns: NS) -> bool { pub fn has<'a, NS: Into<NSChoice<'a>>>(&self, prefix: &Option<String>, wanted_ns: NS) -> bool {
match self.namespaces.get(prefix) { match self.namespaces.get(prefix) {
Some(ns) => self.compare_ns(Some(ns), wanted_ns.into()), Some(ns) => wanted_ns.into().compare(Some(ns)),
None => match *self.parent.borrow() { None => match *self.parent.borrow() {
None => self.compare_ns(None, wanted_ns.into()), None => wanted_ns.into().compare(None),
Some(ref parent) => parent.has(prefix, wanted_ns), Some(ref parent) => parent.has(prefix, wanted_ns),
}, },
} }