aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-07-24 06:27:00 -0700
committerGitHub <noreply@github.com>2017-07-24 06:27:00 -0700
commit4f0821192c112943bb53b4fb04303c1afdde06e6 (patch)
tree5bbf738c07ca64417fc48a353b8680b609e0da28 /components/script/dom
parent9f412caab21ae407173187cdb5d0250fb1ae6b37 (diff)
parenteb98ae6e044ff6fb5ce3cfc6b39c70d40e9880a9 (diff)
downloadservo-4f0821192c112943bb53b4fb04303c1afdde06e6.tar.gz
servo-4f0821192c112943bb53b4fb04303c1afdde06e6.zip
Auto merge of #17820 - servo:token-cache, r=emilio
Update cssparser to 0.18 Do not merge yet, depends on https://github.com/servo/rust-cssparser/pull/171. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17820) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom')
-rw-r--r--components/script/dom/bindings/str.rs6
-rw-r--r--components/script/dom/csskeyframesrule.rs2
2 files changed, 4 insertions, 4 deletions
diff --git a/components/script/dom/bindings/str.rs b/components/script/dom/bindings/str.rs
index 97b58a290e9..761acab3068 100644
--- a/components/script/dom/bindings/str.rs
+++ b/components/script/dom/bindings/str.rs
@@ -4,7 +4,7 @@
//! The `ByteString` struct.
-use cssparser::CompactCowStr;
+use cssparser::CowRcStr;
use html5ever::{LocalName, Namespace};
use servo_atoms::Atom;
use std::ascii::AsciiExt;
@@ -298,8 +298,8 @@ impl<'a> Into<Cow<'a, str>> for DOMString {
}
}
-impl<'a> Into<CompactCowStr<'a>> for DOMString {
- fn into(self) -> CompactCowStr<'a> {
+impl<'a> Into<CowRcStr<'a>> for DOMString {
+ fn into(self) -> CowRcStr<'a> {
self.0.into()
}
}
diff --git a/components/script/dom/csskeyframesrule.rs b/components/script/dom/csskeyframesrule.rs
index 0e4b2e4eaaa..0a5e0e35a7d 100644
--- a/components/script/dom/csskeyframesrule.rs
+++ b/components/script/dom/csskeyframesrule.rs
@@ -121,7 +121,7 @@ impl CSSKeyframesRuleMethods for CSSKeyframesRule {
// Spec deviation: https://github.com/w3c/csswg-drafts/issues/801
// Setting this property to a CSS-wide keyword or `none` does not throw,
// it stores a value that serializes as a quoted string.
- let name = KeyframesName::from_ident(value.into());
+ let name = KeyframesName::from_ident(&value);
let mut guard = self.cssrule.shared_lock().write();
self.keyframesrule.write_with(&mut guard).name = name;
Ok(())