diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index f09a4de3093..b0584810f6f 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -124,9 +124,10 @@ dependencies = [ [[package]] name = "cssparser" version = "0.1.0" -source = "git+https://github.com/servo/rust-cssparser#97d8c3b20a240881573748d4eadcda610bfb888c" +source = "git+https://github.com/servo/rust-cssparser#a2b0b6b00ad84dc3a4b4faf77ddd63611c8ce58a" dependencies = [ "encoding 0.2.3 (git+https://github.com/lifthrasiir/rust-encoding)", + "text_writer 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -681,6 +682,11 @@ dependencies = [ name = "task_info" version = "0.0.1" +[[package]] +name = "text_writer" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "time" version = "0.1.0" diff --git a/components/style/properties/mod.rs.mako b/components/style/properties/mod.rs.mako index f6abe506c57..bc43ce62a94 100644 --- a/components/style/properties/mod.rs.mako +++ b/components/style/properties/mod.rs.mako @@ -2547,13 +2547,13 @@ pub fn parse_property_declaration_list>(input: I, base_url: &U }; match PropertyDeclaration::parse(n.as_slice(), v.as_slice(), list, base_url, seen) { PropertyDeclarationParseResult::UnknownProperty => log_css_error(l, format!( - "Unsupported property: {}:{}", n, v.iter().to_css()).as_slice()), + "Unsupported property: {}:{}", n, v.to_css_string()).as_slice()), PropertyDeclarationParseResult::ExperimentalProperty => log_css_error(l, format!( "Experimental property, use `servo --enable_experimental` \ or `servo -e` to enable: {}:{}", - n, v.iter().to_css()).as_slice()), + n, v.to_css_string()).as_slice()), PropertyDeclarationParseResult::InvalidValue => log_css_error(l, format!( - "Invalid value: {}:{}", n, v.iter().to_css()).as_slice()), + "Invalid value: {}:{}", n, v.to_css_string()).as_slice()), PropertyDeclarationParseResult::ValidOrIgnoredDeclaration => (), } } diff --git a/components/style/stylesheets.rs b/components/style/stylesheets.rs index b271e4e77be..454f4cb5052 100644 --- a/components/style/stylesheets.rs +++ b/components/style/stylesheets.rs @@ -168,7 +168,7 @@ pub fn parse_style_rule(context: &ParserContext, block } = rule; // FIXME: avoid doing this for valid selectors - let serialized = prelude.iter().to_css(); + let serialized = prelude.to_css_string(); match selectors::parse_selector_list(context, prelude.into_iter(), namespaces) { Ok(selectors) => parent_rules.push(CSSRule::Style(StyleRule{ selectors: selectors, diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index 9c70c1e8c43..1eb0fa96386 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -120,9 +120,10 @@ dependencies = [ [[package]] name = "cssparser" version = "0.1.0" -source = "git+https://github.com/servo/rust-cssparser#97d8c3b20a240881573748d4eadcda610bfb888c" +source = "git+https://github.com/servo/rust-cssparser#a2b0b6b00ad84dc3a4b4faf77ddd63611c8ce58a" dependencies = [ "encoding 0.2.3 (git+https://github.com/lifthrasiir/rust-encoding)", + "text_writer 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -665,6 +666,11 @@ dependencies = [ name = "task_info" version = "0.0.1" +[[package]] +name = "text_writer" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "time" version = "0.1.0" diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index c5209915585..f9baefb333e 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -103,9 +103,10 @@ dependencies = [ [[package]] name = "cssparser" version = "0.1.0" -source = "git+https://github.com/servo/rust-cssparser#97d8c3b20a240881573748d4eadcda610bfb888c" +source = "git+https://github.com/servo/rust-cssparser#a2b0b6b00ad84dc3a4b4faf77ddd63611c8ce58a" dependencies = [ "encoding 0.2.3 (git+https://github.com/lifthrasiir/rust-encoding)", + "text_writer 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -613,6 +614,11 @@ dependencies = [ name = "task_info" version = "0.0.1" +[[package]] +name = "text_writer" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "time" version = "0.1.0"