Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use atom! in place of Atom::from_slice where necessary #4068

Merged
merged 1 commit into from Nov 24, 2014
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Use atom! in place of Atom::from_slice where necessary

  • Loading branch information
Manishearth committed Nov 23, 2014
commit 534919327d815c1a369975546c911d38bb4b5004
@@ -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) {
@@ -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:");
@@ -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());
@@ -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)),
}),
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.