diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2015-11-26 00:10:39 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2015-11-26 00:10:39 +0530 |
| commit | 188fa9378c103093f1f8dac24bff0d9d237fd2bc (patch) | |
| tree | 9ef42584eb3b543904524248ad11c1dff84082a5 /components/script/dom/cssstyledeclaration.rs | |
| parent | e7b19249489eff7a7fd49bf458ee7bd681f8ad13 (diff) | |
| parent | 3dec6edd10ec800de50a04c105a75fb98e0411ca (diff) | |
| download | servo-188fa9378c103093f1f8dac24bff0d9d237fd2bc.tar.gz servo-188fa9378c103093f1f8dac24bff0d9d237fd2bc.zip | |
Auto merge of #8667 - asajeffrey:update-string-cache, r=SimonSapin
Update string cache
Updated string_cache to 0.2, and updated the dependencies that depend on string_cache.
Removed references to string_cache_plugin.
Import atom! and ns! from string_cache.
Replaced ns!("") by ns!().
Replaced ns!(XML) and co by ns!(xml) and co.
Replaced Atom::from_slice by Atom::from.
Replaced atom.as_slice() by &*atom.
r? @SimonSapin
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8667)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/cssstyledeclaration.rs')
| -rw-r--r-- | components/script/dom/cssstyledeclaration.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/script/dom/cssstyledeclaration.rs b/components/script/dom/cssstyledeclaration.rs index 05caa20f642..14285dc4c2e 100644 --- a/components/script/dom/cssstyledeclaration.rs +++ b/components/script/dom/cssstyledeclaration.rs @@ -145,7 +145,7 @@ impl CSSStyleDeclarationMethods for CSSStyleDeclaration { // Step 1 property.make_ascii_lowercase(); - let property = Atom::from_slice(&property); + let property = Atom::from(&*property); if self.readonly { // Readonly style declarations are used for getComputedStyle. @@ -160,7 +160,7 @@ impl CSSStyleDeclarationMethods for CSSStyleDeclaration { // Step 2.2 for longhand in shorthand.longhands() { // Step 2.2.1 - let declaration = owner.get_inline_style_declaration(&Atom::from_slice(&longhand)); + let declaration = owner.get_inline_style_declaration(&Atom::from(*longhand)); // Step 2.2.2 & 2.2.3 match declaration { @@ -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_slice(&property); + let property = Atom::from(&*property); // Step 2 if let Some(shorthand) = Shorthand::from_name(&property) { |