Bump serde to 1.0

This commit is contained in:
Bastien Orivel 2017-06-14 18:31:09 +02:00 committed by Simon Sapin
parent e1bce24129
commit 76d8573393
60 changed files with 487 additions and 474 deletions

View file

@ -14,10 +14,10 @@ testing = ["style/testing"]
[dependencies]
byteorder = "1.0"
app_units = "0.4.1"
cssparser = "0.14.0"
euclid = "0.14.4"
html5ever = "0.17"
app_units = "0.5"
cssparser = "0.15"
euclid = "0.15"
html5ever = "0.18"
parking_lot = "0.3"
rayon = "0.8"
rustc-serialize = "0.3"

View file

@ -24,7 +24,7 @@ impl ParseErrorReporter for ErrorringErrorReporter {
url: &ServoUrl,
line_number_offset: u64) {
let location = input.source_location(position);
let line_offset = location.line + line_number_offset as usize;
let line_offset = location.line + line_number_offset as u32;
panic!("CSS error: {}\t\n{}:{} {}", url.as_str(), line_offset, location.column, error.to_string());
}
}

View file

@ -249,8 +249,8 @@ fn test_parse_stylesheet() {
struct CSSError {
pub url : ServoUrl,
pub line: usize,
pub column: usize,
pub line: u32,
pub column: u32,
pub message: String
}
@ -275,7 +275,7 @@ impl ParseErrorReporter for CSSInvalidErrorReporterTest {
line_number_offset: u64) {
let location = input.source_location(position);
let line_offset = location.line + line_number_offset as usize;
let line_offset = location.line + line_number_offset as u32;
let mut errors = self.errors.lock().unwrap();
errors.push(