From 28f5601d72408b083811bb69820c285ae8c161e3 Mon Sep 17 00:00:00 2001 From: Bastien Orivel Date: Sat, 10 Jun 2017 22:56:02 +0200 Subject: [PATCH] Bump serde to 1.0 --- Cargo.lock | 225 +++++++++++++++------------ webrender/Cargo.toml | 18 +-- webrender/src/platform/macos/font.rs | 4 +- webrender_traits/Cargo.toml | 17 +- webrender_traits/src/channel_ipc.rs | 2 +- webrender_traits/src/channel_mpsc.rs | 8 +- webrender_traits/src/display_list.rs | 10 +- webrender_traits/src/font.rs | 4 +- webrender_traits/src/lib.rs | 3 +- webrender_traits/src/webgl.rs | 4 +- wrench/Cargo.toml | 17 +- wrench/src/main.rs | 2 +- 12 files changed, 170 insertions(+), 144 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e092b3b723..634a9b8465 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,25 +2,24 @@ name = "wrench" version = "0.2.3" dependencies = [ - "app_units 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "base64 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "bincode 1.0.0-alpha6 (registry+https://github.com/rust-lang/crates.io-index)", + "bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.20.5 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", - "dwrote 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "dwrote 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.14.4 (registry+https://github.com/rust-lang/crates.io-index)", - "font-loader 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "font-loader 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "osmesa-src 12.0.1 (git+https://github.com/servo/osmesa-src)", "osmesa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.9.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.9.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 0.9.8 (registry+https://github.com/rust-lang/crates.io-index)", - "servo-glutin 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "servo-glutin 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)", "webrender 0.41.0", "webrender_traits 0.41.0", @@ -61,13 +60,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "app_units" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "heapsize 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.9.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -85,12 +84,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "bincode" -version = "1.0.0-alpha6" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.9.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -111,6 +110,11 @@ name = "bitflags" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "bitflags" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "block" version = "0.1.6" @@ -170,12 +174,12 @@ dependencies = [ [[package]] name = "cocoa" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "block 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", "objc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -204,21 +208,21 @@ dependencies = [ [[package]] name = "core-graphics" -version = "0.7.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ + "bitflags 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.9.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "core-text" -version = "4.0.0" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "core-foundation 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -252,15 +256,15 @@ dependencies = [ [[package]] name = "dwrote" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.9.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.9.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -293,13 +297,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "euclid" -version = "0.14.4" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "heapsize 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.9.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "expat-sys" +version = "2.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cmake 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -309,14 +322,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "font-loader" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "core-foundation 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "core-text 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-text 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", - "silverknife-fontconfig-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "servo-fontconfig 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -422,17 +435,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "ipc-channel" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bincode 1.0.0-alpha6 (registry+https://github.com/rust-lang/crates.io-index)", + "bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.9.8 (registry+https://github.com/rust-lang/crates.io-index)", - "uuid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -621,12 +634,12 @@ dependencies = [ [[package]] name = "offscreen_gl_context" -version = "0.9.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cgl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.14.4 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "gl_generator 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -635,7 +648,7 @@ dependencies = [ "libloading 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "osmesa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.9.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", "user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.12.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -661,11 +674,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "plane-split" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "binary-space-partition 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.14.4 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -754,36 +767,59 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde" -version = "0.9.8" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "serde_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", +] [[package]] -name = "serde_codegen_internals" -version = "0.14.0" +name = "serde_derive" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "syn 0.11.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive_internals 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] -name = "serde_derive" -version = "0.9.8" +name = "serde_derive_internals" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "quote 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_codegen_internals 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.11.6 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)", + "synom 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "serde_json" -version = "0.9.8" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "dtoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.9.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "servo-fontconfig" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", + "servo-fontconfig-sys 4.0.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "servo-fontconfig-sys" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "expat-sys 2.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", + "servo-freetype-sys 4.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -797,14 +833,14 @@ dependencies = [ [[package]] name = "servo-glutin" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "android_glue 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "cgl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "cocoa 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cocoa 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "dwmapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "gl_generator 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -839,15 +875,6 @@ dependencies = [ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "silverknife-fontconfig-sys" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "slab" version = "0.3.0" @@ -860,7 +887,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "syn" -version = "0.11.6" +version = "0.11.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "quote 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -969,7 +996,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "uuid" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", @@ -990,15 +1017,15 @@ name = "webrender" version = "0.41.0" dependencies = [ "angle 0.1.2 (git+https://github.com/servo/angle?branch=servo)", - "app_units 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "bincode 1.0.0-alpha6 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "bit-set 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "core-text 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "dwrote 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.14.4 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "core-text 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "dwrote 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "freetype 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "gamma-lut 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1006,11 +1033,11 @@ dependencies = [ "lazy_static 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "plane-split 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "plane-split 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "servo-glutin 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "servo-glutin 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "thread_profiler 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_traits 0.41.0", @@ -1020,19 +1047,18 @@ dependencies = [ name = "webrender_traits" version = "0.41.0" dependencies = [ - "app_units 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "bincode 1.0.0-alpha6 (registry+https://github.com/rust-lang/crates.io-index)", + "app_units 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "core-graphics 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "dwrote 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "euclid 0.14.4 (registry+https://github.com/rust-lang/crates.io-index)", + "core-graphics 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "dwrote 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.9.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.9.8 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1101,13 +1127,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum android_glue 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e2b80445d331077679dfc6f3014f3e9ab7083e588423d35041d3fc017198189" "checksum angle 0.1.2 (git+https://github.com/servo/angle?branch=servo)" = "" "checksum ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "23ac7c30002a5accbf7e8987d0632fa6de155b7c3d39d0067317a391e00a2ef6" -"checksum app_units 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b03f9404bb507e374418345f5ebeef57b32c35e8cb3c36e58a7d0b73fd063c77" +"checksum app_units 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "99f3af85d0c7c054d95da6405117b523284a97484494b44a6dec58b9617eabf6" "checksum base64 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d156a04ec694d726e92ea3c13e4a62949b4f0488a9344f04341d679ec6b127b" "checksum binary-space-partition 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "88ceb0d16c4fd0e42876e298d7d3ce3780dd9ebdcbe4199816a32c77e08597ff" -"checksum bincode 1.0.0-alpha6 (registry+https://github.com/rust-lang/crates.io-index)" = "fb0cdeac1c5d567fdb487ae5853c024e4acf1ea85ba6a6552fe084e0805fea5d" +"checksum bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e103c8b299b28a9c6990458b7013dc4a8356a9b854c51b9883241f5866fac36e" "checksum bit-set 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d9bf6104718e80d7b26a68fdbacff3481cfc05df670821affc7e9cbc1884400c" "checksum bit-vec 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "5b97c2c8e8bbb4251754f559df8af22fb264853c7d009084a576cdf12565089d" "checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d" +"checksum bitflags 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1370e9fc2a6ae53aea8b7a5110edbd08836ed87c88736dfabccade1c2b44bff4" "checksum block 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" "checksum byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c40977b0ee6b9885c9013cd41d9feffdd22deb3bb4dc3a71d901cc7a77de18c8" "checksum cfg-if 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de1e760d7b6535af4241fca8bd8adf68e2e7edacc6b29f5d399050c5e48cf88c" @@ -1115,24 +1142,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum clap 2.20.5 (registry+https://github.com/rust-lang/crates.io-index)" = "7db281b0520e97fbd15cd615dcd8f8bcad0c26f5f7d5effe705f090f39e9a758" "checksum cmake 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "a3a6805df695087e7c1bcd9a82e03ad6fb864c8e67ac41b1348229ce5b7f0407" "checksum coco 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c06169f5beb7e31c7c67ebf5540b8b472d23e3eade3b2ec7d1f5b504a85f91bd" -"checksum cocoa 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d55b620aff4da7d4b9d85f2974cc62a097146623b75e3f36734fe68d8cef493e" +"checksum cocoa 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8d3fa729f0b38d496bcff4564c4cacd99f890e15c2235cc11ae8f4583d36c55" "checksum color_quant 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a475fc4af42d83d28adf72968d9bcfaf035a1a9381642d8e85d8a04957767b0d" "checksum core-foundation 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f51ce3b8ebe311c56de14231eb57572c15abebd2d32b3bcb99bcdb9c101f5ac3" "checksum core-foundation-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "41115a6aa5d3e1e5ef98148373f25971d1fad53818553f216495f9e67e90a624" -"checksum core-graphics 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ead017dcf77f503dc991f6b52de6084eeea60a94b0a652baa9bf88654a28e83f" -"checksum core-text 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0e9719616a10f717628e074744f8c55df7b450f7a34d29c196d14f4498aad05d" +"checksum core-graphics 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a9f841e9637adec70838c537cae52cb4c751cc6514ad05669b51d107c2021c79" +"checksum core-text 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "74ba2a7abdccb94fb6c00822addef48504182b285aa45a30e78286487888fcb4" "checksum crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "0c5ea215664ca264da8a9d9c3be80d2eaf30923c259d03e870388eb927508f97" "checksum deflate 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "24c5f3de3a8e183ab9a169654b652407e5e80bed40986bcca92c2b088b9bfa80" "checksum dtoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "80c8b71fd71146990a9742fc06dcbbde19161a267e0ad4e572c35162f4578c90" "checksum dwmapi-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "07c4c7cc7b396419bc0a4d90371d0cee16cb5053b53647d287c0b728000c41fe" -"checksum dwrote 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "74114b6b49d6731835da7a28a3642651451e315f7f9b9d04e907e65a45681796" +"checksum dwrote 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "36e3b27cd0b8a68e00f07e8d8e1e4f4d8a6b8b873290a734f63bd56d792d23e1" "checksum either 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "18785c1ba806c258137c937e44ada9ee7e69a37e3c72077542cd2f069d78562a" "checksum enum_primitive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "be4551092f4d519593039259a9ed8daedf0da12e5109c5280338073eaeb81180" "checksum env_logger 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e3856f1697098606fc6cb97a93de88ca3f3bc35bb878c725920e6e82ecf05e83" "checksum error-chain 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "318cb3c71ee4cdea69fdc9e15c173b245ed6063e1709029e8fd32525a881120f" -"checksum euclid 0.14.4 (registry+https://github.com/rust-lang/crates.io-index)" = "995b21c36b37e0f18ed9ba1714378a337e3ff19a6e5e952ea94b0f3dd4e12fbc" +"checksum euclid 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "afc5fcf274fa860e18379115ac336e9b41553f61c9ed34ad09e8101ed3defae2" +"checksum expat-sys 2.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cef36cd1a8a02d28b91d97347c63247b9e4cb8a8e36df36f8201dc87a1c0859c" "checksum fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6cc484842f1e2884faf56f529f960cc12ad8c71ce96cc7abba0a067c98fee344" -"checksum font-loader 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ec6c97de7cdb6afb2b71ab8805a6865f464f1f9cf824e51e039871c3296ed5f" +"checksum font-loader 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f0189c0d83acfc1848f66e75a0c3a1231bb65d5183cf2374e86222dfc9a8a66a" "checksum freetype 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fde23272c687e4570aefec06cb71174ec0f5284b725deac4e77ba2665d635faf" "checksum futures 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "55f0008e13fc853f79ea8fc86e931486860d4c4c156cdffb59fa5f7fa833660a" "checksum gamma-lut 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "41f72af1e933f296b827361eb9e70d0267abf8ad0de9ec7fa667bbe67177b297" @@ -1145,7 +1173,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum heapsize 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4c7593b1522161003928c959c20a2ca421c68e940d63d75573316a009e48a6d4" "checksum image 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "979bad0502082fd60053a490282e87d6c89650942e3a270e0d4c83569c7f5899" "checksum inflate 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e7e0062d2dc2f17d2f13750d95316ae8a2ff909af0fda957084f5defd87c43bb" -"checksum ipc-channel 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0b7639999a1fb3f63da25d4bc1f6fe9acbdcd127ae8c81caba66e4faf7bb884f" +"checksum ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a38ad662f104525ac57012e0b79aad07507e3fc11e3bae668bf416264e760ebb" "checksum itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eb2f404fbc66fd9aac13e998248505e7ecb2ad8e44ab6388684c5fb11c6c251c" "checksum jpeg-decoder 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2805ccb10ffe4d10e06ef68a158ff94c255211ecbae848fbde2146b098f93ce7" "checksum json 0.11.5 (registry+https://github.com/rust-lang/crates.io-index)" = "5e7eb285e773498f9473a6e2255feffe95db9c55579c7931a6db83c9e02a4673" @@ -1170,11 +1198,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)" = "e1cbfa3781f3fe73dc05321bed52a06d2d491eaa764c52335cf4399f046ece99" "checksum num_cpus 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a225d1e2717567599c24f88e49f00856c6e825a12125181ee42c4257e3688d39" "checksum objc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "877f30f37acef6749b1841cceab289707f211aecfc756553cd63976190e6cc2e" -"checksum offscreen_gl_context 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0f2b1feeb87a68541c96e07b8b81a3fef0057b026b5f691b4489852811e76804" +"checksum offscreen_gl_context 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c68469bce91af3bf39b41a7960b9af061ecc269b178f8b25c0aaabda5527099c" "checksum osmesa-src 12.0.1 (git+https://github.com/servo/osmesa-src)" = "" "checksum osmesa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "88cfece6e95d2e717e0872a7f53a8684712ad13822a7979bc760b9c77ec0013b" "checksum pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "3a8b4c6b8165cd1a1cd4b9b120978131389f64bdaf456435caa41e630edba903" -"checksum plane-split 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "da4c13e9ba1388fd628ec2bcd69f3346dec64357e9b552601b244f92189d4610" +"checksum plane-split 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e57800a97ca52c556db6b6184a3201f05366ad5e11876f7d17e234589ca2fa26" "checksum png 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3cb773e9a557edb568ce9935cf783e3cdcabe06a9449d41b3e5506d88e582c82" "checksum quote 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "08de3f12e670f83f61e450443cbae34496a35b665691fd8e99b24ec662f75865" "checksum rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "022e0636ec2519ddae48154b028864bdce4eaf7d35226ab8e65c611be97b189d" @@ -1186,18 +1214,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum rustc-serialize 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)" = "237546c689f20bb44980270c73c3b9edd0891c1be49cc1274406134a66d3957b" "checksum scoped_threadpool 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "3ef399c8893e8cb7aa9696e895427fab3a6bf265977bb96e126f24ddd2cda85a" "checksum scopeguard 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c79eb2c3ac4bc2507cda80e7f3ac5b88bd8eae4c0914d5663e6a8933994be918" -"checksum serde 0.9.8 (registry+https://github.com/rust-lang/crates.io-index)" = "204db0f2a5335be7313fd4453132fd56d2085aed081c673140a256772903e116" -"checksum serde_codegen_internals 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a5113d5bd16471b183803b374f0fe4877ad9658b95e33b11f4a004d73aacc74a" -"checksum serde_derive 0.9.8 (registry+https://github.com/rust-lang/crates.io-index)" = "e88ec062a02cbebfd6276044a305d665a9919b497aa6acb2e12c070d1a50d32d" -"checksum serde_json 0.9.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6501ac6f8b74f9b1033f7ddf79a08edfa0f58d6f8e3190cb8dc97736afa257a8" +"checksum serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "c2f530d36fb84ec48fb7146936881f026cdbf4892028835fd9398475f82c1bb4" +"checksum serde_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "10552fad5500771f3902d0c5ba187c5881942b811b7ba0d8fbbfbf84d80806d3" +"checksum serde_derive_internals 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)" = "37aee4e0da52d801acfbc0cc219eb1eda7142112339726e427926a6f6ee65d3a" +"checksum serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "48b04779552e92037212c3615370f6bd57a40ebba7f20e554ff9f55e41a69a7b" +"checksum servo-fontconfig 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a088f8d775a5c5314aae09bd77340bc9c67d72b9a45258be34c83548b4814cd9" +"checksum servo-fontconfig-sys 4.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6be80777ee6edecbbbf8774c76e19dddfe336256c57a4ded06d6ad3df7be358e" "checksum servo-freetype-sys 4.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9232032c2e85118c0282c6562c84cab12316e655491ba0a5d1905b2320060d1b" -"checksum servo-glutin 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ca5892a674fb408a09083168c9aa40cd53d4ce1a736542fd8057d36b2e50e612" +"checksum servo-glutin 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "84be2acc941f5c105021fdc543cd2bcddf2a8ab16cdbbcc1cf53f246a588e378" "checksum shared_library 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fb04126b6fcfd2710fb5b6d18f4207b6c535f2850a7e1a43bcd526d44f30a79a" "checksum shell32-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "72f20b8f3c060374edb8046591ba28f62448c369ccbdc7b02075103fb3a9e38d" -"checksum silverknife-fontconfig-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e15ae311731f5d48c564d271e2d5eecc1e1c9ef29736b33de9d81c33658529b7" "checksum slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "17b4fcaed89ab08ef143da37bc52adbcc04d4a69014f4c1208d6b51f0c47bc23" "checksum strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b4d15c810519a91cf877e7e36e63fe068815c678181439f2f29e2562147c3694" -"checksum syn 0.11.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0e28da8d02d75d1e58b89258e0741128f0b0d8a8309fb5c627be0fbd37a76c67" +"checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" "checksum synom 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8fece1853fb872b0acdc3ff88f37c474018e125ef81cd4cb8c0ca515746b62ed" "checksum term_size 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "07b6c1ac5b3fffd75073276bca1ceed01f67a28537097a2a9539e116e50fb21a" "checksum thread-id 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4437c97558c70d129e40629a5b385b3fb1ffac301e63941335e4d354081ec14a" @@ -1211,7 +1240,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1f2ae5ddb18e1c92664717616dd9549dde73f539f01bd7b77c2edb2446bdff91" "checksum user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ef4711d107b21b410a3a974b1204d9accc8b10dad75d8324b5d755de1617d47" "checksum utf8-ranges 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "662fab6525a98beff2921d7f61a39e7d59e0b425ebc7d0d9e66d316e55124122" -"checksum uuid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7cfec50b0842181ba6e713151b72f4ec84a6a7e2c9c8a8a3ffc37bb1cd16b231" +"checksum uuid 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b5d0f5103675a280a926ec2f9b7bcc2ef49367df54e8c570c3311fec919f9a8b" "checksum vec_map 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cac5efe5cb0fa14ec2f84f83c701c562ee63f6dcc680861b21d65c682adfb05f" "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" diff --git a/webrender/Cargo.toml b/webrender/Cargo.toml index 3b5e122d6d..0d60e6b31a 100644 --- a/webrender/Cargo.toml +++ b/webrender/Cargo.toml @@ -13,36 +13,36 @@ profiler = ["thread_profiler/thread_profiler"] webgl = ["offscreen_gl_context", "webrender_traits/webgl"] [dependencies] -app_units = "0.4" -bincode = "1.0.0-alpha6" +app_units = "0.5" +bincode = "0.8" bit-set = "0.4" byteorder = "1.0" -euclid = "0.14.4" +euclid = "0.15" fnv = "1.0" gleam = "0.4.3" lazy_static = "0.2" log = "0.3" num-traits = "0.1.32" -offscreen_gl_context = {version = "0.9.0", features = ["serde", "osmesa"], optional = true} +offscreen_gl_context = {version = "0.11", features = ["serde", "osmesa"], optional = true} time = "0.1" rayon = "0.8" webrender_traits = {path = "../webrender_traits"} bitflags = "0.7" gamma-lut = "0.2" thread_profiler = "0.1.1" -plane-split = "0.5" +plane-split = "0.6" [dev-dependencies] angle = {git = "https://github.com/servo/angle", branch = "servo"} rand = "0.3" # for the benchmarks -servo-glutin = "0.10.1" # for the example apps +servo-glutin = "0.11" # for the example apps [target.'cfg(any(target_os = "android", all(unix, not(target_os = "macos"))))'.dependencies] freetype = { version = "0.2", default-features = false } [target.'cfg(target_os = "windows")'.dependencies] -dwrote = "0.3" +dwrote = "0.4" [target.'cfg(target_os = "macos")'.dependencies] -core-graphics = "0.7.0" -core-text = "4.0" +core-graphics = "0.8.0" +core-text = "5.0" diff --git a/webrender/src/platform/macos/font.rs b/webrender/src/platform/macos/font.rs index c87402606c..f53f5bbbfe 100644 --- a/webrender/src/platform/macos/font.rs +++ b/webrender/src/platform/macos/font.rs @@ -59,7 +59,7 @@ struct GlyphMetrics { // this function from Skia which is used to check if a glyph // can be rendered with subpixel AA. fn supports_subpixel_aa() -> bool { - let mut cg_context = CGContext::create_bitmap_context(1, 1, 8, 4, + let mut cg_context = CGContext::create_bitmap_context(None, 1, 1, 8, 4, &CGColorSpace::create_device_rgb(), kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Little); @@ -285,7 +285,7 @@ impl FontContext { FontRenderMode::Alpha | FontRenderMode::Mono => kCGImageAlphaPremultipliedLast, }; - let mut cg_context = CGContext::create_bitmap_context(metrics.rasterized_width as usize, + let mut cg_context = CGContext::create_bitmap_context(None, metrics.rasterized_width as usize, metrics.rasterized_height as usize, 8, metrics.rasterized_width as usize * 4, diff --git a/webrender_traits/Cargo.toml b/webrender_traits/Cargo.toml index d8eaaee7d2..2f2ae87ca9 100644 --- a/webrender_traits/Cargo.toml +++ b/webrender_traits/Cargo.toml @@ -11,21 +11,20 @@ ipc = ["ipc-channel"] webgl = ["offscreen_gl_context"] [dependencies] -app_units = "0.4" -bincode = "1.0.0-alpha2" +app_units = "0.5" +bincode = "0.8" byteorder = "1.0" -euclid = "0.14.4" +euclid = "0.15" gleam = "0.4.5" heapsize = ">= 0.3.6, < 0.5" -ipc-channel = {version = "0.7.2", optional = true} -offscreen_gl_context = {version = "0.9", features = ["serde"], optional = true} -serde = "0.9" -serde_derive = "0.9" +ipc-channel = {version = "0.8", optional = true} +offscreen_gl_context = {version = "0.11", features = ["serde"], optional = true} +serde = { version = "1.0", features = ["rc", "derive"] } time = "0.1" [target.'cfg(target_os = "macos")'.dependencies] core-foundation = "0.3" -core-graphics = "0.7" +core-graphics = "0.8" [target.'cfg(target_os = "windows")'.dependencies] -dwrote = "0.3" +dwrote = "0.4" diff --git a/webrender_traits/src/channel_ipc.rs b/webrender_traits/src/channel_ipc.rs index 3f6db0cba1..a220cb445c 100644 --- a/webrender_traits/src/channel_ipc.rs +++ b/webrender_traits/src/channel_ipc.rs @@ -34,7 +34,7 @@ impl PayloadReceiverHelperMethods for PayloadReceiver { } } -pub fn msg_channel() -> Result<(MsgSender, MsgReceiver), Error> { +pub fn msg_channel Deserialize<'de>>() -> Result<(MsgSender, MsgReceiver), Error> { ipc::channel() } diff --git a/webrender_traits/src/channel_mpsc.rs b/webrender_traits/src/channel_mpsc.rs index 4f0d3f44c7..6a10444b23 100644 --- a/webrender_traits/src/channel_mpsc.rs +++ b/webrender_traits/src/channel_mpsc.rs @@ -83,16 +83,16 @@ impl Serialize for MsgSender { } } -impl Deserialize for MsgReceiver { +impl<'de, T> Deserialize<'de> for MsgReceiver { fn deserialize(_: D) -> Result, D::Error> - where D: Deserializer { + where D: Deserializer<'de> { unreachable!(); } } -impl Deserialize for MsgSender { +impl<'de, T> Deserialize<'de> for MsgSender { fn deserialize(_: D) -> Result, D::Error> - where D: Deserializer { + where D: Deserializer<'de> { unreachable!(); } } diff --git a/webrender_traits/src/display_list.rs b/webrender_traits/src/display_list.rs index c29a0152ee..fbcf83851a 100644 --- a/webrender_traits/src/display_list.rs +++ b/webrender_traits/src/display_list.rs @@ -125,7 +125,7 @@ impl BuiltDisplayList { BuiltDisplayListIter::new(self) } - pub fn get(&self, range: ItemRange) -> AuxIter { + pub fn get<'de, T: Deserialize<'de>>(&self, range: ItemRange) -> AuxIter { AuxIter::new(&self.data[range.start .. range.start + range.length]) } } @@ -212,7 +212,7 @@ impl<'a> BuiltDisplayListIter<'a> { /// Returns the byte-range the slice occupied, and the number of elements /// in the slice. - fn skip_slice(&mut self) -> (ItemRange, usize) { + fn skip_slice Deserialize<'de>>(&mut self) -> (ItemRange, usize) { let base = self.list.data.as_ptr() as usize; let start = self.data.as_ptr() as usize; @@ -333,7 +333,7 @@ impl<'a, 'b> DisplayItemRef<'a, 'b> { } } -impl<'a, T: Deserialize> AuxIter<'a, T> { +impl<'de, 'a, T: Deserialize<'de>> AuxIter<'a, T> { pub fn new(mut data: &'a [u8]) -> Self { let size: usize = if data.len() == 0 { @@ -351,7 +351,7 @@ impl<'a, T: Deserialize> AuxIter<'a, T> { } } -impl<'a, T: Deserialize> Iterator for AuxIter<'a, T> { +impl<'a, T: for<'de> Deserialize<'de>> Iterator for AuxIter<'a, T> { type Item = T; fn next(&mut self) -> Option { @@ -369,7 +369,7 @@ impl<'a, T: Deserialize> Iterator for AuxIter<'a, T> { } } -impl<'a, T: Deserialize> ::std::iter::ExactSizeIterator for AuxIter<'a, T> { } +impl<'a, T: for<'de> Deserialize<'de>> ::std::iter::ExactSizeIterator for AuxIter<'a, T> { } // This is purely for the JSON writer in wrench diff --git a/webrender_traits/src/font.rs b/webrender_traits/src/font.rs index 46a9291842..7aac67a380 100644 --- a/webrender_traits/src/font.rs +++ b/webrender_traits/src/font.rs @@ -26,8 +26,8 @@ impl Serialize for NativeFontHandle { } #[cfg(target_os = "macos")] -impl Deserialize for NativeFontHandle { - fn deserialize(deserializer: D) -> Result where D: Deserializer { +impl<'de> Deserialize<'de> for NativeFontHandle { + fn deserialize(deserializer: D) -> Result where D: Deserializer<'de> { let postscript_name: String = try!(Deserialize::deserialize(deserializer)); match CGFont::from_name(&CFString::new(&*postscript_name)) { diff --git a/webrender_traits/src/lib.rs b/webrender_traits/src/lib.rs index c26cc62237..b06ad1d812 100644 --- a/webrender_traits/src/lib.rs +++ b/webrender_traits/src/lib.rs @@ -18,9 +18,8 @@ extern crate heapsize; extern crate ipc_channel; #[cfg(feature = "webgl")] extern crate offscreen_gl_context; -extern crate serde; #[macro_use] -extern crate serde_derive; +extern crate serde; extern crate time; #[cfg(target_os = "macos")] diff --git a/webrender_traits/src/webgl.rs b/webrender_traits/src/webgl.rs index 711a14acb2..e6b5def656 100644 --- a/webrender_traits/src/webgl.rs +++ b/webrender_traits/src/webgl.rs @@ -176,9 +176,9 @@ macro_rules! define_resource_id { ($name:ident) => { define_resource_id_struct!($name); - impl ::serde::Deserialize for $name { + impl<'de> ::serde::Deserialize<'de> for $name { fn deserialize(deserializer: D) -> Result - where D: ::serde::Deserializer + where D: ::serde::Deserializer<'de> { let id = try!(u32::deserialize(deserializer)); if id == 0 { diff --git a/wrench/Cargo.toml b/wrench/Cargo.toml index f2b116d4d1..e08c8a9813 100644 --- a/wrench/Cargo.toml +++ b/wrench/Cargo.toml @@ -7,33 +7,32 @@ license = "MPL-2.0" [dependencies] base64 = "0.3" -bincode = "1.0.0-alpha2" +bincode = "0.8" byteorder = "1.0" env_logger = { version = "0.4", optional = true } -euclid = "0.14.4" +euclid = "0.15" gleam = "0.4" -servo-glutin = "0.10.1" -app_units = "0.4" +servo-glutin = "0.11" +app_units = "0.5" image = "0.12" clap = { version = "2", features = ["yaml"] } lazy_static = "0.2" yaml-rust = { git = "https://github.com/vvuk/yaml-rust", features = ["preserve_order"] } -serde_json = "0.9" +serde_json = "1.0" time = "0.1" crossbeam = "0.2" osmesa-sys = { version = "0.1.2", optional = true } osmesa-src = { git = "https://github.com/servo/osmesa-src", optional = true } webrender = {path = "../webrender"} webrender_traits = {path = "../webrender_traits"} -serde_derive = "0.9" -serde = "0.9" +serde = {version = "1.0", features = ["derive"] } [features] headless = [ "osmesa-sys", "osmesa-src" ] logging = [ "env_logger" ] [target.'cfg(target_os = "windows")'.dependencies] -dwrote = "0.3" +dwrote = "0.4" [target.'cfg(any(target_os = "linux", target_os = "macos"))'.dependencies] -font-loader = "0.2.0" +font-loader = "0.3.0" diff --git a/wrench/src/main.rs b/wrench/src/main.rs index 5a6a93e582..f3c733b2a4 100644 --- a/wrench/src/main.rs +++ b/wrench/src/main.rs @@ -24,7 +24,7 @@ extern crate lazy_static; #[cfg(feature = "headless")] extern crate osmesa_sys; #[macro_use] -extern crate serde_derive; +extern crate serde; extern crate serde_json; extern crate time; extern crate webrender;