Skip to content

Commit 55af8ce

Browse files
committed
servo: Merge #17820 - Update cssparser to 0.18 (from servo:token-cache); r=emilio
Do not merge yet, depends on servo/rust-cssparser#171. Source-Repo: https://github.com/servo/servo Source-Revision: 4f0821192c112943bb53b4fb04303c1afdde06e6
1 parent f3be3c3 commit 55af8ce

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+542
-513
lines changed

servo/Cargo.lock

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

servo/components/canvas/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ path = "lib.rs"
1212
[dependencies]
1313
azure = {git = "https://github.com/servo/rust-azure"}
1414
canvas_traits = {path = "../canvas_traits"}
15-
cssparser = "0.17.0"
15+
cssparser = "0.18"
1616
euclid = "0.15"
1717
gleam = "0.4"
1818
ipc-channel = "0.8"

servo/components/canvas_traits/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ name = "canvas_traits"
1010
path = "lib.rs"
1111

1212
[dependencies]
13-
cssparser = "0.17.0"
13+
cssparser = "0.18"
1414
euclid = "0.15"
1515
heapsize = "0.4"
1616
heapsize_derive = "0.1"

servo/components/script/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ byteorder = "1.0"
3434
canvas_traits = {path = "../canvas_traits"}
3535
caseless = "0.1.0"
3636
cookie = "0.6"
37-
cssparser = "0.17.0"
37+
cssparser = "0.18"
3838
deny_public_fields = {path = "../deny_public_fields"}
3939
devtools_traits = {path = "../devtools_traits"}
4040
dom_struct = {path = "../dom_struct"}

servo/components/script/dom/bindings/str.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
//! The `ByteString` struct.
66
7-
use cssparser::CompactCowStr;
7+
use cssparser::CowRcStr;
88
use html5ever::{LocalName, Namespace};
99
use servo_atoms::Atom;
1010
use std::ascii::AsciiExt;
@@ -298,8 +298,8 @@ impl<'a> Into<Cow<'a, str>> for DOMString {
298298
}
299299
}
300300

301-
impl<'a> Into<CompactCowStr<'a>> for DOMString {
302-
fn into(self) -> CompactCowStr<'a> {
301+
impl<'a> Into<CowRcStr<'a>> for DOMString {
302+
fn into(self) -> CowRcStr<'a> {
303303
self.0.into()
304304
}
305305
}

servo/components/script/dom/csskeyframesrule.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ impl CSSKeyframesRuleMethods for CSSKeyframesRule {
121121
// Spec deviation: https://github.com/w3c/csswg-drafts/issues/801
122122
// Setting this property to a CSS-wide keyword or `none` does not throw,
123123
// it stores a value that serializes as a quoted string.
124-
let name = KeyframesName::from_ident(value.into());
124+
let name = KeyframesName::from_ident(&value);
125125
let mut guard = self.cssrule.shared_lock().write();
126126
self.keyframesrule.write_with(&mut guard).name = name;
127127
Ok(())

servo/components/script_layout_interface/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ path = "lib.rs"
1313
app_units = "0.5"
1414
atomic_refcell = "0.1"
1515
canvas_traits = {path = "../canvas_traits"}
16-
cssparser = "0.17.0"
16+
cssparser = "0.18"
1717
euclid = "0.15"
1818
gfx_traits = {path = "../gfx_traits"}
1919
heapsize = "0.4"

servo/components/selectors/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ unstable = []
2525
[dependencies]
2626
bitflags = "0.7"
2727
matches = "0.1"
28-
cssparser = "0.17.0"
28+
cssparser = "0.18"
2929
log = "0.3"
3030
fnv = "1.0"
3131
phf = "0.7.18"

0 commit comments

Comments
 (0)