Switch to string-cache for string interning

Author: kmcallister

Cargo.toml

@@ -9,6 +9,11 @@ git = "https://github.com/sfackler/rust-phf"
 [dependencies.phf_mac]
 git = "https://github.com/sfackler/rust-phf"
 
+[dependencies.string_cache]
+git = "https://github.com/servo/string-cache"
+[dependencies.string_cache_macros]
+git = "https://github.com/servo/string-cache"
+
 [dependencies.html5ever-macros]
 path = "macros"
 

examples/noop-tree-builder.rs

@@ -8,6 +8,7 @@
 // except according to those terms.
 
 extern crate debug;
+extern crate string_cache;
 
 extern crate html5ever;
 
@@ -16,8 +17,9 @@ use std::default::Default;
 use std::string::String;
 use std::collections::hashmap::HashMap;
 use std::str::MaybeOwned;
+use string_cache::Atom;
 
-use html5ever::{Namespace, Atom, parse_to, one_input};
+use html5ever::{Namespace, parse_to, one_input};
 use html5ever::tokenizer::Attribute;
 use html5ever::tree_builder::{TreeSink, QuirksMode, NodeOrText};
 

examples/print-rcdom.rs

@@ -39,7 +39,7 @@ fn walk(indent: uint, handle: Handle) {
         Element(ref name, ref attrs) => {
             print!("<{:s}", name.as_slice());
             for attr in attrs.iter() {
-                print!(" {:s}=\"{:s}\"", attr.name.name, attr.value);
+                print!(" {:s}=\"{:s}\"", attr.name.name.as_slice(), attr.value);
             }
             println!(">");
         }

examples/print-tree-actions.rs

@@ -8,6 +8,7 @@
 // except according to those terms.
 
 extern crate debug;
+extern crate string_cache;
 
 extern crate html5ever;
 
@@ -16,8 +17,9 @@ use std::default::Default;
 use std::string::String;
 use std::collections::hashmap::HashMap;
 use std::str::MaybeOwned;
+use string_cache::Atom;
 
-use html5ever::{Namespace, Atom, parse_to, one_input};
+use html5ever::{Namespace, parse_to, one_input};
 use html5ever::tokenizer::Attribute;
 use html5ever::tree_builder::{TreeSink, QuirksMode, NodeOrText, AppendNode, AppendText};
 
@@ -57,7 +59,7 @@ impl TreeSink<uint> for Sink {
 
     fn create_element(&mut self, ns: Namespace, name: Atom, _attrs: Vec<Attribute>) -> uint {
         let id = self.get_id();
-        println!("Created {:?}:{:s} as {:u}", ns, name, id);
+        println!("Created {:?}:{:s} as {:u}", ns, name.as_slice(), id);
         self.names.insert(id, (ns, name));
         id
     }

examples/tokenize.rs

@@ -52,11 +52,12 @@ impl TokenSink for TokenPrinter {
                 self.is_char(false);
                 // This is not proper HTML serialization, of course.
                 match tag.kind {
-                    StartTag => print!("TAG  : <\x1b[32m{:s}\x1b[0m", tag.name),
-                    EndTag   => print!("TAG  : <\x1b[31m/{:s}\x1b[0m", tag.name),
+                    StartTag => print!("TAG  : <\x1b[32m{:s}\x1b[0m", tag.name.as_slice()),
+                    EndTag   => print!("TAG  : <\x1b[31m/{:s}\x1b[0m", tag.name.as_slice()),
                 }
                 for attr in tag.attrs.iter() {
-                    print!(" \x1b[36m{:s}\x1b[0m='\x1b[34m{:s}\x1b[0m'", attr.name, attr.value);
+                    print!(" \x1b[36m{:s}\x1b[0m='\x1b[34m{:s}\x1b[0m'",
+                        attr.name.name.as_slice(), attr.value);
                 }
                 if tag.self_closing {
                     print!(" \x1b[31m/\x1b[0m");