aboutsummaryrefslogtreecommitdiffstats
path: root/ports/geckolib/error_reporter.rs
diff options
context:
space:
mode:
authorSimon Sapin <simon.sapin@exyr.org>2017-07-20 21:03:53 +0200
committerSimon Sapin <simon.sapin@exyr.org>2017-07-24 11:39:12 +0200
commiteb98ae6e044ff6fb5ce3cfc6b39c70d40e9880a9 (patch)
tree2367c47afe499cace142636d2887f281cdf6fa3b /ports/geckolib/error_reporter.rs
parent30d6d6024bd0a082424395621f620dc9580970e5 (diff)
downloadservo-eb98ae6e044ff6fb5ce3cfc6b39c70d40e9880a9.tar.gz
servo-eb98ae6e044ff6fb5ce3cfc6b39c70d40e9880a9.zip
Update cssparser to 0.18
https://github.com/servo/rust-cssparser/pull/171
Diffstat (limited to 'ports/geckolib/error_reporter.rs')
-rw-r--r--ports/geckolib/error_reporter.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/ports/geckolib/error_reporter.rs b/ports/geckolib/error_reporter.rs
index a8abdb0347f..e829737fa73 100644
--- a/ports/geckolib/error_reporter.rs
+++ b/ports/geckolib/error_reporter.rs
@@ -7,7 +7,7 @@
#![allow(unsafe_code)]
use cssparser::{Parser, SourcePosition, ParseError as CssParseError, Token, BasicParseError};
-use cssparser::CompactCowStr;
+use cssparser::CowRcStr;
use selectors::parser::SelectorParseError;
use style::error_reporting::{ParseErrorReporter, ContextualParseError};
use style::gecko_bindings::bindings::{Gecko_CreateCSSErrorReporter, Gecko_DestroyCSSErrorReporter};
@@ -43,15 +43,15 @@ impl Drop for ErrorReporter {
}
enum ErrorString<'a> {
- Snippet(CompactCowStr<'a>),
- Ident(CompactCowStr<'a>),
+ Snippet(CowRcStr<'a>),
+ Ident(CowRcStr<'a>),
UnexpectedToken(Token<'a>),
}
impl<'a> ErrorString<'a> {
fn into_str(self) -> String {
match self {
- ErrorString::Snippet(s) => s.into_owned(),
+ ErrorString::Snippet(s) => s.as_ref().to_owned(),
ErrorString::Ident(i) => escape_css_ident(&i),
ErrorString::UnexpectedToken(t) => token_to_str(t),
}
@@ -186,13 +186,13 @@ fn token_to_str<'a>(t: Token<'a>) -> String {
}
trait ErrorHelpers<'a> {
- fn error_data(self) -> (CompactCowStr<'a>, ParseError<'a>);
+ fn error_data(self) -> (CowRcStr<'a>, ParseError<'a>);
fn error_param(self) -> ErrorString<'a>;
fn to_gecko_message(&self) -> &'static [u8];
}
impl<'a> ErrorHelpers<'a> for ContextualParseError<'a> {
- fn error_data(self) -> (CompactCowStr<'a>, ParseError<'a>) {
+ fn error_data(self) -> (CowRcStr<'a>, ParseError<'a>) {
match self {
ContextualParseError::UnsupportedPropertyDeclaration(s, err) |
ContextualParseError::UnsupportedFontFaceDescriptor(s, err) |