diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-06-16 05:03:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-16 05:03:18 -0700 |
| commit | 66c130d55aa0d7af1104c00e93a5bf950f23a383 (patch) | |
| tree | 6896ae8b01e5d3dd26c97c11950fcd61acd4b883 /components/script_layout_interface | |
| parent | e1bce241291683ee61abab042d0c808ae5396e91 (diff) | |
| parent | 605ef8b7ecd31aead8c29dcc034bcf1e4f3c73c7 (diff) | |
| download | servo-66c130d55aa0d7af1104c00e93a5bf950f23a383.tar.gz servo-66c130d55aa0d7af1104c00e93a5bf950f23a383.zip | |
Auto merge of #17355 - servo:serdeup, r=nox
Bump serde to 1.0
This is a rebase of #17325 with `[replace]` entries removed, a bunch more dependencies updated, and some more compile fixes. Original work by @Eijebong, thanks a lot!
<!-- 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/17355)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script_layout_interface')
| -rw-r--r-- | components/script_layout_interface/Cargo.toml | 10 | ||||
| -rw-r--r-- | components/script_layout_interface/reporter.rs | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/components/script_layout_interface/Cargo.toml b/components/script_layout_interface/Cargo.toml index 6fa9b81ad71..b14e9395b21 100644 --- a/components/script_layout_interface/Cargo.toml +++ b/components/script_layout_interface/Cargo.toml @@ -10,16 +10,16 @@ name = "script_layout_interface" path = "lib.rs" [dependencies] -app_units = "0.4.1" +app_units = "0.5" atomic_refcell = "0.1" canvas_traits = {path = "../canvas_traits"} -cssparser = "0.14.0" -euclid = "0.14.4" +cssparser = "0.15" +euclid = "0.15" gfx_traits = {path = "../gfx_traits"} heapsize = "0.4" heapsize_derive = "0.1" -html5ever = "0.17" -ipc-channel = "0.7" +html5ever = "0.18" +ipc-channel = "0.8" libc = "0.2" log = "0.3.5" msg = {path = "../msg"} diff --git a/components/script_layout_interface/reporter.rs b/components/script_layout_interface/reporter.rs index 432b6a0b037..ec3dfae91a9 100644 --- a/components/script_layout_interface/reporter.rs +++ b/components/script_layout_interface/reporter.rs @@ -29,7 +29,7 @@ impl ParseErrorReporter for CSSErrorReporter { 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; if log_enabled!(log::LogLevel::Info) { info!("Url:\t{}\n{}:{} {}", url.as_str(), |