Auto merge of #9742 - nox:atom-from-string, r=ecoal95

Make use of From<String> for Atom

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9742)
<!-- Reviewable:end -->

components/gfx/Cargo.toml

@@ -26,7 +26,7 @@ serde = "0.6"
 serde_macros = "0.6"
 servo-skia = "0.20130412.0"
 smallvec = "0.1"
-string_cache = {version = "0.2.9", features = ["heap_size"]}
+string_cache = {version = "0.2.10", features = ["heap_size"]}
 time = "0.1.12"
 unicode-script = { version = "0.1", features = ["harfbuzz"] }
 url = {version = "0.5.5", features = ["heap_size"]}

components/gfx/font_cache_thread.rs

@@ -230,7 +230,7 @@ impl FontCache {
                     let family_name = LowercaseString::new(family.name());
 
                     let templates = &mut self.web_families.get_mut(&family_name).unwrap();
-                    templates.add_template(Atom::from(&*url.to_string()), Some(bytes));
+                    templates.add_template(Atom::from(url.to_string()), Some(bytes));
                     drop(result.send(()));
                 }
                 Command::Exit(result) => {

components/layout/Cargo.toml

@@ -75,7 +75,7 @@ serde = "0.6"
 serde_json = "0.6"
 serde_macros = "0.6"
 smallvec = "0.1"
-string_cache = {version = "0.2.9", features = ["heap_size"]}
+string_cache = {version = "0.2.10", features = ["heap_size"]}
 time = "0.1"
 unicode-bidi = "0.2"
 unicode-script = { version = "0.1", features = ["harfbuzz"] }

components/script/Cargo.toml

@@ -84,7 +84,7 @@ rustc-serialize = "0.3"
 selectors = {version = "0.5", features = ["heap_size"]}
 serde = "0.6"
 smallvec = "0.1"
-string_cache = {version = "0.2.9", features = ["heap_size", "unstable"]}
+string_cache = {version = "0.2.10", features = ["heap_size", "unstable"]}
 time = "0.1.12"
 unicase = "1.0"
 url = {version = "0.5.5", features = ["heap_size"]}

components/script/dom/bindings/xmlname.rs

@@ -174,6 +174,6 @@ pub fn xml_name_type(name: &str) -> XMLName {
 pub fn namespace_from_domstring(url: Option<DOMString>) -> Namespace {
     match url {
         None => ns!(),
-        Some(s) => Namespace(Atom::from(&*s)),
+        Some(s) => Namespace(Atom::from(s)),
     }
 }

components/script/dom/closeevent.rs

@@ -67,7 +67,7 @@ impl CloseEvent {
             EventCancelable::NotCancelable
         };
         Ok(CloseEvent::new(global,
-                           Atom::from(&*type_),
+                           Atom::from(type_),
                            bubbles,
                            cancelable,
                            init.wasClean,

components/script/dom/cssstyledeclaration.rs

@@ -146,7 +146,7 @@ impl CSSStyleDeclarationMethods for CSSStyleDeclaration {
 
         // Step 1
         property.make_ascii_lowercase();
-        let property = Atom::from(&*property);
+        let property = Atom::from(property);
 
         if self.readonly {
             // Readonly style declarations are used for getComputedStyle.
@@ -185,7 +185,7 @@ impl CSSStyleDeclarationMethods for CSSStyleDeclaration {
     fn GetPropertyPriority(&self, mut property: DOMString) -> DOMString {
         // Step 1
         property.make_ascii_lowercase();
-        let property = Atom::from(&*property);
+        let property = Atom::from(property);
 
         // Step 2
         if let Some(shorthand) = Shorthand::from_name(&property) {

components/script/dom/customevent.rs

@@ -53,7 +53,7 @@ impl CustomEvent {
                        init: &CustomEventBinding::CustomEventInit)
                        -> Fallible<Root<CustomEvent>> {
         Ok(CustomEvent::new(global,
-                            Atom::from(&*type_),
+                            Atom::from(type_),
                             init.parent.bubbles,
                             init.parent.cancelable,
                             unsafe { HandleValue::from_marked_location(&init.detail) }))
@@ -87,7 +87,7 @@ impl CustomEventMethods for CustomEvent {
                        can_bubble: bool,
                        cancelable: bool,
                        detail: HandleValue) {
-        self.init_custom_event(Atom::from(&*type_), can_bubble, cancelable, detail)
+        self.init_custom_event(Atom::from(type_), can_bubble, cancelable, detail)
     }
 
     // https://dom.spec.whatwg.org/#dom-event-istrusted

components/script/dom/document.rs

@@ -536,7 +536,7 @@ impl Document {
             // Step 3 & 4
             String::from_utf8(percent_decode(fragid.as_bytes())).ok()
                 // Step 5
-                .and_then(|decoded_fragid| self.get_element_by_id(&Atom::from(&*decoded_fragid)))
+                .and_then(|decoded_fragid| self.get_element_by_id(&Atom::from(decoded_fragid)))
                 // Step 6
                 .or_else(|| self.get_anchor_by_name(fragid))
                 // Step 7
@@ -1847,7 +1847,7 @@ impl DocumentMethods for Document {
             Vacant(entry) => {
                 let mut tag_copy = tag_name;
                 tag_copy.make_ascii_lowercase();
-                let ascii_lower_tag = Atom::from(&*tag_copy);
+                let ascii_lower_tag = Atom::from(tag_copy);
                 let result = HTMLCollection::by_atomic_tag_name(&self.window,
                                                                 self.upcast(),
                                                                 tag_atom,
@@ -1864,7 +1864,7 @@ impl DocumentMethods for Document {
                               tag_name: DOMString)
                               -> Root<HTMLCollection> {
         let ns = namespace_from_domstring(maybe_ns);
-        let local = Atom::from(&*tag_name);
+        let local = Atom::from(tag_name);
         let qname = QualName::new(ns, local);
         match self.tagns_map.borrow_mut().entry(qname.clone()) {
             Occupied(entry) => Root::from_ref(entry.get()),
@@ -1895,7 +1895,7 @@ impl DocumentMethods for Document {
 
     // https://dom.spec.whatwg.org/#dom-nonelementparentnode-getelementbyid
     fn GetElementById(&self, id: DOMString) -> Option<Root<Element>> {
-        self.get_element_by_id(&Atom::from(&*id))
+        self.get_element_by_id(&Atom::from(id))
     }
 
     // https://dom.spec.whatwg.org/#dom-document-createelement
@@ -1907,7 +1907,7 @@ impl DocumentMethods for Document {
         if self.is_html_document {
             local_name.make_ascii_lowercase();
         }
-        let name = QualName::new(ns!(html), Atom::from(&*local_name));
+        let name = QualName::new(ns!(html), Atom::from(local_name));
         Ok(Element::create(name, None, self, ElementCreator::ScriptCreated))
     }
 
@@ -1931,12 +1931,10 @@ impl DocumentMethods for Document {
         if self.is_html_document {
             local_name.make_ascii_lowercase();
         }
-        let name = Atom::from(&*local_name);
+        let name = Atom::from(local_name);
-        // repetition used because string_cache::atom::Atom is non-copyable
-        let l_name = Atom::from(&*local_name);
         let value = AttrValue::String(DOMString::new());
 
-        Ok(Attr::new(&self.window, name, value, l_name, ns!(), None, None))
+        Ok(Attr::new(&self.window, name.clone(), value, name, ns!(), None, None))
     }
 
     // https://dom.spec.whatwg.org/#dom-document-createattributens
@@ -1947,7 +1945,7 @@ impl DocumentMethods for Document {
         let (namespace, prefix, local_name) = try!(validate_and_extract(namespace,
                                                                         &qualified_name));
         let value = AttrValue::String(DOMString::new());
-        let qualified_name = Atom::from(&*qualified_name);
+        let qualified_name = Atom::from(qualified_name);
         Ok(Attr::new(&self.window,
                      local_name,
                      value,
@@ -2493,7 +2491,7 @@ impl DocumentMethods for Document {
                 _ => false,
             }
         }
-        let name = Atom::from(&*name);
+        let name = Atom::from(name);
         let root = self.upcast::<Node>();
         {
             // Step 1.

components/script/dom/documentfragment.rs

@@ -55,7 +55,7 @@ impl DocumentFragmentMethods for DocumentFragment {
     // https://dom.spec.whatwg.org/#dom-nonelementparentnode-getelementbyid
     fn GetElementById(&self, id: DOMString) -> Option<Root<Element>> {
         let node = self.upcast::<Node>();
-        let id = Atom::from(&*id);
+        let id = Atom::from(id);
         node.traverse_preorder().filter_map(Root::downcast::<Element>).find(|descendant| {
             match descendant.get_attribute(&ns!(), &atom!("id")) {
                 None => false,

components/script/dom/element.rs

@@ -617,7 +617,7 @@ impl Element {
         if self.html_element_in_html_document() {
             name.make_ascii_lowercase();
         }
-        Atom::from(&*name)
+        Atom::from(name)
     }
 
     pub fn namespace(&self) -> &Namespace {
@@ -925,7 +925,7 @@ impl Element {
             None => qname.local.clone(),
             Some(ref prefix) => {
                 let name = format!("{}:{}", &**prefix, &*qname.local);
-                Atom::from(&*name)
+                Atom::from(name)
             },
         };
         let value = self.parse_attribute(&qname.ns, &qname.local, value);
@@ -952,7 +952,7 @@ impl Element {
         }
 
         // Steps 2-5.
-        let name = Atom::from(&*name);
+        let name = Atom::from(name);
         let value = self.parse_attribute(&ns!(), &name, value);
         self.set_first_matching_attribute(name.clone(),
                                           value,
@@ -1249,7 +1249,7 @@ impl ElementMethods for Element {
                           local_name: DOMString)
                           -> Option<Root<Attr>> {
         let namespace = &namespace_from_domstring(namespace);
-        self.get_attribute(namespace, &Atom::from(&*local_name))
+        self.get_attribute(namespace, &Atom::from(local_name))
     }
 
     // https://dom.spec.whatwg.org/#dom-element-setattribute
@@ -1277,7 +1277,7 @@ impl ElementMethods for Element {
                       value: DOMString) -> ErrorResult {
         let (namespace, prefix, local_name) =
             try!(validate_and_extract(namespace, &qualified_name));
-        let qualified_name = Atom::from(&*qualified_name);
+        let qualified_name = Atom::from(qualified_name);
         let value = self.parse_attribute(&namespace, &local_name, value);
         self.set_first_matching_attribute(
             local_name.clone(), value, qualified_name, namespace.clone(), prefix,
@@ -1344,7 +1344,7 @@ impl ElementMethods for Element {
     // https://dom.spec.whatwg.org/#dom-element-removeattributens
     fn RemoveAttributeNS(&self, namespace: Option<DOMString>, local_name: DOMString) {
         let namespace = namespace_from_domstring(namespace);
-        let local_name = Atom::from(&*local_name);
+        let local_name = Atom::from(local_name);
         self.remove_attribute(&namespace, &local_name);
     }
 

components/script/dom/errorevent.rs

@@ -99,7 +99,7 @@ impl ErrorEvent {
         // Dictionaries need to be rooted
         // https://github.com/servo/servo/issues/6381
         let error = RootedValue::new(global.get_cx(), init.error);
-        let event = ErrorEvent::new(global, Atom::from(&*type_),
+        let event = ErrorEvent::new(global, Atom::from(type_),
                                 bubbles, cancelable,
                                 msg, file_name,
                                 line_num, col_num,

components/script/dom/event.rs

@@ -96,7 +96,7 @@ impl Event {
                        init: &EventBinding::EventInit) -> Fallible<Root<Event>> {
         let bubbles = if init.bubbles { EventBubbles::Bubbles } else { EventBubbles::DoesNotBubble };
         let cancelable = if init.cancelable { EventCancelable::Cancelable } else { EventCancelable::NotCancelable };
-        Ok(Event::new(global, Atom::from(&*type_), bubbles, cancelable))
+        Ok(Event::new(global, Atom::from(type_), bubbles, cancelable))
     }
 
     pub fn init_event(&self, type_: Atom, bubbles: bool, cancelable: bool) {
@@ -240,7 +240,7 @@ impl EventMethods for Event {
                  type_: DOMString,
                  bubbles: bool,
                  cancelable: bool) {
-         self.init_event(Atom::from(&*type_), bubbles, cancelable)
+         self.init_event(Atom::from(type_), bubbles, cancelable)
     }
 
     // https://dom.spec.whatwg.org/#dom-event-istrusted

components/script/dom/eventtarget.rs

@@ -390,7 +390,7 @@ impl EventTarget {
                                                           b"colno\0" as *const u8 as *const c_char,
                                                           b"error\0" as *const u8 as *const c_char];
         // step 10
-        let is_error = ty == &Atom::from("error") && self.is::<Window>();
+        let is_error = ty == &atom!("error") && self.is::<Window>();
         let args = unsafe {
             if is_error {
                 &ERROR_ARG_NAMES[..]
@@ -494,7 +494,7 @@ impl EventTargetMethods for EventTarget {
                         capture: bool) {
         if let Some(listener) = listener {
             let mut handlers = self.handlers.borrow_mut();
-            let entry = match handlers.entry(Atom::from(&*ty)) {
+            let entry = match handlers.entry(Atom::from(ty)) {
                 Occupied(entry) => entry.into_mut(),
                 Vacant(entry) => entry.insert(EventListeners(vec!())),
             };
@@ -517,7 +517,7 @@ impl EventTargetMethods for EventTarget {
                            capture: bool) {
         if let Some(ref listener) = listener {
             let mut handlers = self.handlers.borrow_mut();
-            let entry = handlers.get_mut(&Atom::from(&*ty));
+            let entry = handlers.get_mut(&Atom::from(ty));
             for entry in entry {
                 let phase = if capture { ListenerPhase::Capturing } else { ListenerPhase::Bubbling };
                 let old_entry = EventListenerEntry {

components/script/dom/formdata.rs

@@ -59,7 +59,7 @@ impl FormDataMethods for FormData {
     // https://xhr.spec.whatwg.org/#dom-formdata-append
     fn Append(&self, name: USVString, value: USVString) {
         let mut data = self.data.borrow_mut();
-        match data.entry(Atom::from(&*name.0)) {
+        match data.entry(Atom::from(name.0)) {
             Occupied(entry) => entry.into_mut().push(FormDatum::StringData(value.0)),
             Vacant  (entry) => { entry.insert(vec!(FormDatum::StringData(value.0))); }
         }
@@ -70,7 +70,7 @@ impl FormDataMethods for FormData {
     fn Append_(&self, name: USVString, value: &Blob, filename: Option<USVString>) {
         let blob = FormDatum::BlobData(JS::from_rooted(&self.get_file_or_blob(value, filename)));
         let mut data = self.data.borrow_mut();
-        match data.entry(Atom::from(&*name.0)) {
+        match data.entry(Atom::from(name.0)) {
             Occupied(entry) => entry.into_mut().push(blob),
             Vacant(entry) => {
                 entry.insert(vec!(blob));
@@ -80,13 +80,13 @@ impl FormDataMethods for FormData {
 
     // https://xhr.spec.whatwg.org/#dom-formdata-delete
     fn Delete(&self, name: USVString) {
-        self.data.borrow_mut().remove(&Atom::from(&*name.0));
+        self.data.borrow_mut().remove(&Atom::from(name.0));
     }
 
     // https://xhr.spec.whatwg.org/#dom-formdata-get
     fn Get(&self, name: USVString) -> Option<BlobOrUSVString> {
         self.data.borrow()
-                 .get(&Atom::from(&*name.0))
+                 .get(&Atom::from(name.0))
                  .map(|entry| match entry[0] {
                      FormDatum::StringData(ref s) => BlobOrUSVString::USVString(USVString(s.clone())),
                      FormDatum::BlobData(ref b) => BlobOrUSVString::Blob(Root::from_ref(&*b)),
@@ -96,7 +96,7 @@ impl FormDataMethods for FormData {
     // https://xhr.spec.whatwg.org/#dom-formdata-getall
     fn GetAll(&self, name: USVString) -> Vec<BlobOrUSVString> {
         self.data.borrow()
-                 .get(&Atom::from(&*name.0))
+                 .get(&Atom::from(name.0))
                  .map_or(vec![], |data|
                     data.iter().map(|item| match *item {
                         FormDatum::StringData(ref s) => BlobOrUSVString::USVString(USVString(s.clone())),
@@ -107,7 +107,7 @@ impl FormDataMethods for FormData {
 
     // https://xhr.spec.whatwg.org/#dom-formdata-has
     fn Has(&self, name: USVString) -> bool {
-        self.data.borrow().contains_key(&Atom::from(&*name.0))
+        self.data.borrow().contains_key(&Atom::from(name.0))
     }
 
     #[allow(unrooted_must_root)]
@@ -117,7 +117,7 @@ impl FormDataMethods for FormData {
             BlobOrUSVString::USVString(s) => FormDatum::StringData(s.0),
             BlobOrUSVString::Blob(b) => FormDatum::BlobData(JS::from_rooted(&b))
         };
-        self.data.borrow_mut().insert(Atom::from(&*name.0), vec!(val));
+        self.data.borrow_mut().insert(Atom::from(name.0), vec!(val));
     }
 }
 

components/script/dom/htmlcollection.rs

@@ -115,9 +115,9 @@ impl HTMLCollection {
 
     pub fn by_tag_name(window: &Window, root: &Node, mut tag: DOMString)
                        -> Root<HTMLCollection> {
-        let tag_atom = Atom::from(&*tag); // FIXME(ajeffrey): Convert directly from DOMString to Atom
+        let tag_atom = Atom::from(&*tag);
         tag.make_ascii_lowercase();
-        let ascii_lower_tag = Atom::from(&*tag); // FIXME(ajeffrey): Convert directly from DOMString to Atom
+        let ascii_lower_tag = Atom::from(tag); // FIXME(ajeffrey): don't clone atom if it was already lowercased.
         HTMLCollection::by_atomic_tag_name(window, root, tag_atom, ascii_lower_tag)
     }
 
@@ -148,7 +148,7 @@ impl HTMLCollection {
 
     pub fn by_tag_name_ns(window: &Window, root: &Node, tag: DOMString,
                           maybe_ns: Option<DOMString>) -> Root<HTMLCollection> {
-        let local = Atom::from(&*tag); // FIXME(ajeffrey): Convert directly from DOMString to Atom
+        let local = Atom::from(tag);
         let ns = namespace_from_domstring(maybe_ns);
         let qname = QualName::new(ns, local);
         HTMLCollection::by_qual_tag_name(window, root, qname)

components/script/dom/htmlelement.rs

@@ -340,7 +340,7 @@ impl HTMLElement {
 
     pub fn get_custom_attr(&self, local_name: DOMString) -> Option<DOMString> {
         // FIXME(ajeffrey): Convert directly from DOMString to Atom
-        let local_name = Atom::from(&*to_snake_case(local_name));
+        let local_name = Atom::from(to_snake_case(local_name));
         self.upcast::<Element>().get_attribute(&ns!(), &local_name).map(|attr| {
             DOMString::from(&**attr.value()) // FIXME(ajeffrey): Convert directly from AttrValue to DOMString
         })
@@ -348,7 +348,7 @@ impl HTMLElement {
 
     pub fn delete_custom_attr(&self, local_name: DOMString) {
         // FIXME(ajeffrey): Convert directly from DOMString to Atom
-        let local_name = Atom::from(&*to_snake_case(local_name));
+        let local_name = Atom::from(to_snake_case(local_name));
         self.upcast::<Element>().remove_attribute(&ns!(), &local_name);
     }
 

components/script/dom/messageevent.rs

@@ -67,7 +67,7 @@ impl MessageEvent {
         // Dictionaries need to be rooted
         // https://github.com/servo/servo/issues/6381
         let data = RootedValue::new(global.get_cx(), init.data);
-        let ev = MessageEvent::new(global, Atom::from(&*type_), init.parent.bubbles, init.parent.cancelable,
+        let ev = MessageEvent::new(global, Atom::from(type_), init.parent.bubbles, init.parent.cancelable,
                                    data.handle(),
                                    init.origin.clone(), init.lastEventId.clone());
         Ok(ev)

components/script/dom/namednodemap.rs

@@ -56,7 +56,7 @@ impl NamedNodeMapMethods for NamedNodeMap {
     fn GetNamedItemNS(&self, namespace: Option<DOMString>, local_name: DOMString)
                      -> Option<Root<Attr>> {
         let ns = namespace_from_domstring(namespace);
-        self.owner.get_attribute(&ns, &Atom::from(&*local_name))
+        self.owner.get_attribute(&ns, &Atom::from(local_name))
     }
 
     // https://dom.spec.whatwg.org/#dom-namednodemap-setnameditem
@@ -79,7 +79,7 @@ impl NamedNodeMapMethods for NamedNodeMap {
     fn RemoveNamedItemNS(&self, namespace: Option<DOMString>, local_name: DOMString)
                       -> Fallible<Root<Attr>> {
         let ns = namespace_from_domstring(namespace);
-        self.owner.remove_attribute(&ns, &Atom::from(&*local_name))
+        self.owner.remove_attribute(&ns, &Atom::from(local_name))
             .ok_or(Error::NotFound)
     }
 

components/script/dom/progressevent.rs

@@ -50,7 +50,7 @@ impl ProgressEvent {
         let bubbles = if init.parent.bubbles { EventBubbles::Bubbles } else { EventBubbles::DoesNotBubble };
         let cancelable = if init.parent.cancelable { EventCancelable::Cancelable }
                          else { EventCancelable::NotCancelable };
-        let ev = ProgressEvent::new(global, Atom::from(&*type_), bubbles, cancelable,
+        let ev = ProgressEvent::new(global, Atom::from(type_), bubbles, cancelable,
                                     init.lengthComputable, init.loaded, init.total);
         Ok(ev)
     }

components/script/dom/storageevent.rs

@@ -76,7 +76,7 @@ impl StorageEvent {
         } else {
             EventCancelable::NotCancelable
         };
-        let event = StorageEvent::new(global, Atom::from(&*type_),
+        let event = StorageEvent::new(global, Atom::from(type_),
                                       bubbles, cancelable,
                                       key, oldValue, newValue,
                                       url, storageArea);

components/script/dom/uievent.rs

@@ -92,7 +92,7 @@ impl UIEventMethods for UIEvent {
             return;
         }
 
-        event.init_event(Atom::from(&*type_), can_bubble, cancelable);
+        event.init_event(Atom::from(type_), can_bubble, cancelable);
         self.view.set(view);
         self.detail.set(detail);
     }

components/script/dom/webglcontextevent.rs

@@ -79,7 +79,7 @@ impl WebGLContextEvent {
             EventCancelable::NotCancelable
         };
 
-        Ok(WebGLContextEvent::new(global, Atom::from(&*type_),
+        Ok(WebGLContextEvent::new(global, Atom::from(type_),
                                   bubbles,
                                   cancelable,
                                   status_message))

components/servo/Cargo.lock

@@ -683,7 +683,7 @@ dependencies = [
  "servo-skia 0.20130412.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "simd 0.1.0 (git+https://github.com/huonw/simd)",
  "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "style 0.0.1",
  "style_traits 0.0.1",
  "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -852,7 +852,7 @@ dependencies = [
  "phf 0.7.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "phf_codegen 0.7.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "tendril 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1025,7 +1025,7 @@ dependencies = [
  "serde_json 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "style 0.0.1",
  "style_traits 0.0.1",
  "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1631,7 +1631,7 @@ dependencies = [
  "selectors 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "style 0.0.1",
  "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicase 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1690,7 +1690,7 @@ dependencies = [
  "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "quickersort 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1863,7 +1863,7 @@ dependencies = [
 
 [[package]]
 name = "string_cache"
-version = "0.2.9"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "debug_unreachable 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1897,7 +1897,7 @@ dependencies = [
  "serde 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "style_traits 0.0.1",
  "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1914,7 +1914,7 @@ dependencies = [
  "msg 0.0.1",
  "plugins 0.0.1",
  "selectors 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "style 0.0.1",
  "style_traits 0.0.1",
  "url 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2102,7 +2102,7 @@ dependencies = [
  "serde 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -2321,7 +2321,7 @@ dependencies = [
  "phf 0.7.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "phf_codegen 0.7.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "tendril 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

components/style/Cargo.toml

@@ -36,7 +36,7 @@ selectors = {version = "0.5", features = ["heap_size", "unstable"]}
 serde = "0.6"
 serde_macros = "0.6"
 smallvec = "0.1"
-string_cache = {version = "0.2.9", features = ["heap_size"]}
+string_cache = {version = "0.2.10", features = ["heap_size"]}
 time = "0.1"
 url = {version = "0.5.5", features = ["heap_size"]}
 

components/style/attr.rs

@@ -129,8 +129,7 @@ impl AttrValue {
     }
 
     pub fn from_atomic(string: DOMString) -> AttrValue {
-        // FIXME(ajeffrey): convert directly from DOMString to Atom
+        let value = Atom::from(string);
-        let value = Atom::from(&*string);
         AttrValue::Atom(value)
     }
 

components/style/properties.mako.rs

@@ -1793,7 +1793,7 @@ pub mod longhands {
                 value.push_str(" ");
                 value.push_str(&ident);
             }
-            Ok(FontFamily::FamilyName(Atom::from(&*value)))
+            Ok(FontFamily::FamilyName(Atom::from(value)))
         }
     </%self:longhand>
 

components/style/stylesheets.rs

@@ -396,7 +396,7 @@ impl<'a, Impl: SelectorImpl> AtRuleParser for TopLevelRuleParser<'a, Impl> {
                     self.state.set(State::Namespaces);
 
                     let prefix = input.try(|input| input.expect_ident()).ok().map(|p| p.into_owned());
-                    let url = Namespace(Atom::from(&*try!(input.expect_url_or_string())));
+                    let url = Namespace(Atom::from(try!(input.expect_url_or_string())));
                     return Ok(AtRuleType::WithoutBlock(CSSRule::Namespace(prefix, url)))
                 } else {
                     return Err(())  // "@namespace must be before any rule but @charset and @import"

components/util/Cargo.toml

@@ -46,7 +46,7 @@ selectors = {version = "0.5", features = ["heap_size"]}
 serde = "0.6"
 serde_macros = "0.6"
 smallvec = "0.1"
-string_cache = {version = "0.2.9", features = ["heap_size"]}
+string_cache = {version = "0.2.10", features = ["heap_size"]}
 url = {version = "0.5.5", features = ["heap_size", "serde_serialization"]}
 uuid = "0.1.17"
 

components/util/str.rs

@@ -11,6 +11,7 @@ use std::fmt;
 use std::iter::{Filter, Peekable};
 use std::ops::{Deref, DerefMut};
 use std::str::{Bytes, CharIndices, FromStr, Split, from_utf8};
+use string_cache::Atom;
 
 #[derive(Clone, Debug, Deserialize, Eq, Hash, HeapSizeOf, Ord, PartialEq, PartialOrd, Serialize)]
 pub struct DOMString(String);
@@ -96,6 +97,12 @@ impl<'a> From<&'a str> for DOMString {
     }
 }
 
+impl From<DOMString> for Atom {
+    fn from(contents: DOMString) -> Atom {
+        Atom::from(contents.0)
+    }
+}
+
 impl From<DOMString> for String {
     fn from(contents: DOMString) -> String {
         contents.0

ports/cef/Cargo.lock

@@ -622,7 +622,7 @@ dependencies = [
  "servo-skia 0.20130412.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "simd 0.1.0 (git+https://github.com/huonw/simd)",
  "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "style 0.0.1",
  "style_traits 0.0.1",
  "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -782,7 +782,7 @@ dependencies = [
  "phf 0.7.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "phf_codegen 0.7.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "tendril 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -955,7 +955,7 @@ dependencies = [
  "serde_json 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "style 0.0.1",
  "style_traits 0.0.1",
  "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1517,7 +1517,7 @@ dependencies = [
  "selectors 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "style 0.0.1",
  "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicase 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1567,7 +1567,7 @@ dependencies = [
  "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "quickersort 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1777,7 +1777,7 @@ dependencies = [
 
 [[package]]
 name = "string_cache"
-version = "0.2.9"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "debug_unreachable 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1811,7 +1811,7 @@ dependencies = [
  "serde 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "style_traits 0.0.1",
  "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1999,7 +1999,7 @@ dependencies = [
  "serde 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -2207,7 +2207,7 @@ dependencies = [
  "phf 0.7.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "phf_codegen 0.7.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "tendril 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

ports/geckolib/Cargo.lock

@@ -15,7 +15,7 @@ dependencies = [
  "plugins 0.0.1",
  "selectors 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "style 0.0.1",
  "url 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
@@ -371,7 +371,7 @@ dependencies = [
  "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "quickersort 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -407,7 +407,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "string_cache"
-version = "0.2.9"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "debug_unreachable 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -441,7 +441,7 @@ dependencies = [
  "serde 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "style_traits 0.0.1",
  "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -550,7 +550,7 @@ dependencies = [
  "serde 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

ports/geckolib/Cargo.toml

@@ -21,7 +21,7 @@ log = "0.3"
 num_cpus = "0.2.2"
 selectors = {version = "0.5", features = ["heap_size"]}
 smallvec = "0.1"
-string_cache = {version = "0.2.9", features = ["heap_size"]}
+string_cache = {version = "0.2.10", features = ["heap_size"]}
 url = {version = "0.5.5", features = ["heap_size"]}
 
 [dependencies.plugins]

ports/geckolib/wrapper.rs

@@ -406,7 +406,7 @@ impl<'le> ::selectors::Element for GeckoElement<'le> {
         unsafe {
             let mut length: u32 = 0;
             let p = Gecko_LocalName(self.element, &mut length);
-            Atom::from(&*String::from_utf16(slice::from_raw_parts(p, length as usize)).unwrap())
+            Atom::from(String::from_utf16(slice::from_raw_parts(p, length as usize)).unwrap())
         }
         */
     }
@@ -417,7 +417,7 @@ impl<'le> ::selectors::Element for GeckoElement<'le> {
         unsafe {
             let mut length: u32 = 0;
             let p = Gecko_Namespace(self.element, &mut length);
-            Namespace(Atom::from(&*String::from_utf16(slice::from_raw_parts(p, length as usize)).unwrap()))
+            Namespace(Atom::from(String::from_utf16(slice::from_raw_parts(p, length as usize)).unwrap()))
         }
         */
     }

ports/gonk/Cargo.lock

@@ -624,7 +624,7 @@ dependencies = [
  "servo-skia 0.20130412.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "simd 0.1.0 (git+https://github.com/huonw/simd)",
  "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "style 0.0.1",
  "style_traits 0.0.1",
  "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -763,7 +763,7 @@ dependencies = [
  "phf 0.7.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "phf_codegen 0.7.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "tendril 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -936,7 +936,7 @@ dependencies = [
  "serde_json 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "style 0.0.1",
  "style_traits 0.0.1",
  "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1498,7 +1498,7 @@ dependencies = [
  "selectors 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "style 0.0.1",
  "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicase 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1548,7 +1548,7 @@ dependencies = [
  "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "quickersort 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1756,7 +1756,7 @@ dependencies = [
 
 [[package]]
 name = "string_cache"
-version = "0.2.9"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "debug_unreachable 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1790,7 +1790,7 @@ dependencies = [
  "serde 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "style_traits 0.0.1",
  "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1978,7 +1978,7 @@ dependencies = [
  "serde 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -2155,7 +2155,7 @@ dependencies = [
  "phf 0.7.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "phf_codegen 0.7.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "string_cache 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "tendril 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

tests/unit/style/Cargo.toml

@@ -28,5 +28,5 @@ app_units = {version = "0.2.1", features = ["plugins"]}
 cssparser = {version = "0.5.3", features = ["heap_size"]}
 euclid = {version = "0.6.2", features = ["plugins"]}
 selectors = {version = "0.5", features = ["heap_size"]}
-string_cache = {version = "0.2.9", features = ["heap_size"]}
+string_cache = {version = "0.2.10", features = ["heap_size"]}
 url = {version = "0.5.5", features = ["heap_size"]}