diff options
| -rw-r--r-- | components/script/dom/element.rs | 2 | ||||
| -rw-r--r-- | components/script/dom/htmlserializer.rs | 4 | ||||
| -rw-r--r-- | components/style/selector_matching.rs | 4 | ||||
| -rw-r--r-- | components/style/selectors.rs | 4 |
4 files changed, 6 insertions, 8 deletions
diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs index a5bac9110f2..815a9dec925 100644 --- a/components/script/dom/element.rs +++ b/components/script/dom/element.rs @@ -824,7 +824,7 @@ impl<'a> ElementMethods for JSRef<'a, Element> { let name = Atom::from_slice(name.as_slice()); let local_name = Atom::from_slice(local_name); - let xmlns = Atom::from_slice("xmlns"); // TODO: Make this a static atom type + let xmlns = atom!("xmlns"); // Step 7a. if xmlns == name && namespace != ns!(XMLNS) { diff --git a/components/script/dom/htmlserializer.rs b/components/script/dom/htmlserializer.rs index 38a56feb23e..8a04fa717a1 100644 --- a/components/script/dom/htmlserializer.rs +++ b/components/script/dom/htmlserializer.rs @@ -18,8 +18,6 @@ use dom::node::{TextNodeTypeId, NodeHelpers}; use dom::processinginstruction::ProcessingInstruction; use dom::text::Text; -use string_cache::Atom; - #[allow(unrooted_must_root)] pub fn serialize(iterator: &mut NodeIterator) -> String { let mut html = String::new(); @@ -141,7 +139,7 @@ fn serialize_attr(attr: JSRef<Attr>, html: &mut String) { html.push_str("xml:"); html.push_str(attr.local_name().as_slice()); } else if *attr.namespace() == ns!(XMLNS) && - *attr.local_name() == Atom::from_slice("xmlns") { + *attr.local_name() == atom!("xmlns") { html.push_str("xmlns"); } else if *attr.namespace() == ns!(XMLNS) { html.push_str("xmlns:"); diff --git a/components/style/selector_matching.rs b/components/style/selector_matching.rs index 3ccb21bfeed..5dfe11dc046 100644 --- a/components/style/selector_matching.rs +++ b/components/style/selector_matching.rs @@ -1230,7 +1230,7 @@ mod tests { fn test_get_id_name(){ let rules_list = get_mock_rules([".intro", "#top"]); assert_eq!(SelectorMap::get_id_name(&rules_list[0][0]), None); - assert_eq!(SelectorMap::get_id_name(&rules_list[1][0]), Some(Atom::from_slice("top"))); + assert_eq!(SelectorMap::get_id_name(&rules_list[1][0]), Some(atom!("top"))); } #[test] @@ -1260,7 +1260,7 @@ mod tests { let rules_list = get_mock_rules([".intro.foo", "#top"]); let mut selector_map = SelectorMap::new(); selector_map.insert(rules_list[1][0].clone()); - assert_eq!(1, selector_map.id_hash.find(&Atom::from_slice("top")).unwrap()[0].declarations.source_order); + assert_eq!(1, selector_map.id_hash.find(&atom!("top")).unwrap()[0].declarations.source_order); selector_map.insert(rules_list[0][0].clone()); assert_eq!(0, selector_map.class_hash.find(&Atom::from_slice("intro")).unwrap()[0].declarations.source_order); assert!(selector_map.class_hash.find(&Atom::from_slice("foo")).is_none()); diff --git a/components/style/selectors.rs b/components/style/selectors.rs index 4a6f5f6cb32..61ed5b7e0d2 100644 --- a/components/style/selectors.rs +++ b/components/style/selectors.rs @@ -719,8 +719,8 @@ mod tests { simple_selectors: vec!(), next: Some((box CompoundSelector { simple_selectors: vec!(LocalNameSelector(LocalName { - name: Atom::from_slice("div"), - lower_name: Atom::from_slice("div") })), + name: atom!("div"), + lower_name: atom!("div") })), next: None, }, Descendant)), }), |