aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/bindings/xmlname.rs
diff options
context:
space:
mode:
authorAlan Jeffrey <ajeffrey@mozilla.com>2015-11-24 13:44:59 -0600
committerAlan Jeffrey <ajeffrey@mozilla.com>2015-11-25 10:13:21 -0600
commit3dec6edd10ec800de50a04c105a75fb98e0411ca (patch)
tree9ef42584eb3b543904524248ad11c1dff84082a5 /components/script/dom/bindings/xmlname.rs
parente7b19249489eff7a7fd49bf458ee7bd681f8ad13 (diff)
downloadservo-3dec6edd10ec800de50a04c105a75fb98e0411ca.tar.gz
servo-3dec6edd10ec800de50a04c105a75fb98e0411ca.zip
Update string_cache to 0.2.
Updated string_cache, html5ever, xml5ever and selectors in Cargo.toml files and Cargo.lock. Removed references to string_cache_plugin. Import atom! and ns! from string_cache. Replaced ns!("") by ns!(). Replaced ns!(XML) and co by ns!(xml) and co. Replaced atom!(foo) by atom!("foo"). Replaced Atom::from_slice by Atom::from. Replaced atom.as_slice() by &*atom.
Diffstat (limited to 'components/script/dom/bindings/xmlname.rs')
-rw-r--r--components/script/dom/bindings/xmlname.rs14
1 files changed, 7 insertions, 7 deletions
diff --git a/components/script/dom/bindings/xmlname.rs b/components/script/dom/bindings/xmlname.rs
index 63a71b266b7..957de10c9eb 100644
--- a/components/script/dom/bindings/xmlname.rs
+++ b/components/script/dom/bindings/xmlname.rs
@@ -57,25 +57,25 @@ pub fn validate_and_extract(namespace: Option<DOMString>,
debug_assert!(!local_name.contains(colon));
match (namespace, maybe_prefix) {
- (ns!(""), Some(_)) => {
+ (ns!(), Some(_)) => {
// Step 6.
Err(Error::Namespace)
},
- (ref ns, Some("xml")) if ns != &ns!(XML) => {
+ (ref ns, Some("xml")) if ns != &ns!(xml) => {
// Step 7.
Err(Error::Namespace)
},
- (ref ns, p) if ns != &ns!(XMLNS) && (qualified_name == "xmlns" || p == Some("xmlns")) => {
+ (ref ns, p) if ns != &ns!(xmlns) && (qualified_name == "xmlns" || p == Some("xmlns")) => {
// Step 8.
Err(Error::Namespace)
},
- (ns!(XMLNS), p) if qualified_name != "xmlns" && p != Some("xmlns") => {
+ (ns!(xmlns), p) if qualified_name != "xmlns" && p != Some("xmlns") => {
// Step 9.
Err(Error::Namespace)
},
(ns, p) => {
// Step 10.
- Ok((ns, p.map(Atom::from_slice), Atom::from_slice(local_name)))
+ Ok((ns, p.map(Atom::from), Atom::from(local_name)))
}
}
}
@@ -171,7 +171,7 @@ pub fn xml_name_type(name: &str) -> XMLName {
/// If the URL is None, returns the empty namespace.
pub fn namespace_from_domstring(url: Option<DOMString>) -> Namespace {
match url {
- None => ns!(""),
- Some(ref s) => Namespace(Atom::from_slice(s)),
+ None => ns!(),
+ Some(s) => Namespace(Atom::from(&*s)),
}
}