diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs index 3a7e7f861f2..340337d96e1 100644 --- a/components/script/dom/element.rs +++ b/components/script/dom/element.rs @@ -910,7 +910,7 @@ impl Element { } pub fn set_attribute(&self, name: &Atom, value: AttrValue) { - assert!(&**name == name.to_ascii_lowercase()); + assert!(name == &name.to_ascii_lowercase()); assert!(!name.contains(":")); self.set_first_matching_attribute(name.clone(), @@ -1017,7 +1017,7 @@ impl Element { } pub fn set_atomic_attribute(&self, local_name: &Atom, value: DOMString) { - assert!(&**local_name == local_name.to_ascii_lowercase()); + assert!(*local_name == local_name.to_ascii_lowercase()); let value = AttrValue::from_atomic(value); self.set_attribute(local_name, value); } @@ -1042,7 +1042,7 @@ impl Element { } pub fn get_url_attribute(&self, local_name: &Atom) -> DOMString { - assert!(&**local_name == local_name.to_ascii_lowercase()); + assert!(*local_name == local_name.to_ascii_lowercase()); if !self.has_attribute(local_name) { return DOMString::new(); } @@ -1067,7 +1067,7 @@ impl Element { } } pub fn set_string_attribute(&self, local_name: &Atom, value: DOMString) { - assert!(&**local_name == local_name.to_ascii_lowercase()); + assert!(*local_name == local_name.to_ascii_lowercase()); self.set_attribute(local_name, AttrValue::String(value)); } @@ -1081,12 +1081,12 @@ impl Element { } pub fn set_tokenlist_attribute(&self, local_name: &Atom, value: DOMString) { - assert!(&**local_name == local_name.to_ascii_lowercase()); + assert!(*local_name == local_name.to_ascii_lowercase()); self.set_attribute(local_name, AttrValue::from_serialized_tokenlist(value)); } pub fn set_atomic_tokenlist_attribute(&self, local_name: &Atom, tokens: Vec) { - assert!(&**local_name == local_name.to_ascii_lowercase()); + assert!(*local_name == local_name.to_ascii_lowercase()); self.set_attribute(local_name, AttrValue::from_atomic_tokens(tokens)); } @@ -1110,7 +1110,7 @@ impl Element { } pub fn set_int_attribute(&self, local_name: &Atom, value: i32) { - assert!(&**local_name == local_name.to_ascii_lowercase()); + assert!(*local_name == local_name.to_ascii_lowercase()); self.set_attribute(local_name, AttrValue::Int(DOMString::from(value.to_string()), value)); } @@ -1128,7 +1128,7 @@ impl Element { } } pub fn set_uint_attribute(&self, local_name: &Atom, value: u32) { - assert!(&**local_name == local_name.to_ascii_lowercase()); + assert!(*local_name == local_name.to_ascii_lowercase()); // FIXME(ajeffrey): Directly convert u32 to DOMString self.set_attribute(local_name, AttrValue::UInt(DOMString::from(value.to_string()), value)); diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 086a8baf811..83368e8df21 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -636,7 +636,7 @@ dependencies = [ "servo-skia 0.20130412.3 (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.3 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.5 (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)", "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -801,7 +801,7 @@ dependencies = [ "phf_codegen 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)", "rc 0.1.1 (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.3 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -961,7 +961,7 @@ dependencies = [ "serde_json 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.6.5 (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.3 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.5 (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)", @@ -1525,7 +1525,7 @@ dependencies = [ "selectors 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.6 (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.3 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "style_traits 0.0.1", "tendril 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1581,7 +1581,7 @@ dependencies = [ "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "quickersort 1.0.0 (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.3 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1751,7 +1751,7 @@ dependencies = [ [[package]] name = "string_cache" -version = "0.2.3" +version = "0.2.5" 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)", @@ -1782,7 +1782,7 @@ dependencies = [ "serde 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.6.5 (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.3 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", "url 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", @@ -1798,7 +1798,7 @@ dependencies = [ "msg 0.0.1", "plugins 0.0.1", "selectors 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "style_traits 0.0.1", "url 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1966,7 +1966,7 @@ dependencies = [ "serde 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.6.5 (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.3 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2132,7 +2132,7 @@ dependencies = [ "phf_codegen 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)", "rc 0.1.1 (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.3 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index 823bb105887..9c3bd919b2d 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -603,7 +603,7 @@ dependencies = [ "servo-skia 0.20130412.3 (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.3 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.5 (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)", "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -761,7 +761,7 @@ dependencies = [ "phf_codegen 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)", "rc 0.1.1 (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.3 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -921,7 +921,7 @@ dependencies = [ "serde_json 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.6.5 (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.3 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.5 (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)", @@ -1450,7 +1450,7 @@ dependencies = [ "selectors 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.6 (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.3 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "style_traits 0.0.1", "tendril 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1497,7 +1497,7 @@ dependencies = [ "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "quickersort 1.0.0 (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.3 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1703,7 +1703,7 @@ dependencies = [ [[package]] name = "string_cache" -version = "0.2.3" +version = "0.2.5" 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)", @@ -1734,7 +1734,7 @@ dependencies = [ "serde 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.6.5 (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.3 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", "url 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", @@ -1901,7 +1901,7 @@ dependencies = [ "serde 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.6.5 (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.3 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2056,7 +2056,7 @@ dependencies = [ "phf_codegen 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)", "rc 0.1.1 (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.3 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index a3a57274330..9f9cfccee97 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -601,7 +601,7 @@ dependencies = [ "servo-skia 0.20130412.3 (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.3 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.5 (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)", "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -737,7 +737,7 @@ dependencies = [ "phf_codegen 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)", "rc 0.1.1 (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.3 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -897,7 +897,7 @@ dependencies = [ "serde_json 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.6.5 (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.3 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.5 (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)", @@ -1426,7 +1426,7 @@ dependencies = [ "selectors 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.6 (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.3 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "style_traits 0.0.1", "tendril 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1473,7 +1473,7 @@ dependencies = [ "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "quickersort 1.0.0 (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.3 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1677,7 +1677,7 @@ dependencies = [ [[package]] name = "string_cache" -version = "0.2.3" +version = "0.2.5" 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)", @@ -1708,7 +1708,7 @@ dependencies = [ "serde 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.6.5 (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.3 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", "url 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", @@ -1875,7 +1875,7 @@ dependencies = [ "serde 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.6.5 (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.3 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1999,7 +1999,7 @@ dependencies = [ "phf_codegen 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)", "rc 0.1.1 (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.3 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)", ]