diff --git a/Cargo.lock b/Cargo.lock index ac776f9f55f8..f9e1bc7c5676 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5,8 +5,8 @@ dependencies = [ "ipc-channel 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "rust-webvr 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.9.15 (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)", ] [[package]] @@ -58,14 +58,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "app_units" version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/Eijebong/app_units.git?branch=serde1.0#a2b8424ad310b11d40acc3600d3450bc1ee34f04" 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.24 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "app_units" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +replace = "app_units 0.4.2 (git+https://github.com/Eijebong/app_units.git?branch=serde1.0)" + [[package]] name = "arraydeque" version = "0.2.3" @@ -111,11 +117,17 @@ dependencies = [ name = "azure" version = "0.17.0" source = "git+https://github.com/servo/rust-azure#3944a65fd2a3790c85e3770d5130e1b4ab153b68" +replace = "azure 0.17.0 (git+https://github.com/Eijebong/rust-azure.git?branch=serde1.0)" + +[[package]] +name = "azure" +version = "0.17.0" +source = "git+https://github.com/Eijebong/rust-azure.git?branch=serde1.0#9bc8054cff8735f5aa414b77c365ba83bffd4d80" dependencies = [ "cmake 0.1.22 (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-text 4.0.0 (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)", "euclid 0.14.4 (registry+https://github.com/rust-lang/crates.io-index)", "freetype 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", @@ -163,12 +175,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.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -240,7 +252,7 @@ dependencies = [ "servo_config 0.0.1", "servo_rand 0.0.1", "tinyfiledialogs 2.5.9 (registry+https://github.com/rust-lang/crates.io-index)", - "uuid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -249,8 +261,8 @@ version = "0.0.1" dependencies = [ "ipc-channel 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.9.15 (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)", "servo_config 0.0.1", ] @@ -334,8 +346,8 @@ dependencies = [ "heapsize 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.9.15 (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)", "webrender_traits 0.40.0 (git+https://github.com/servo/webrender)", ] @@ -429,15 +441,21 @@ dependencies = [ [[package]] name = "cocoa" version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/Eijebong/cocoa-rs.git?branch=bump_graphics#10602cb5328b40df8c33875ab85081929fde8f4c" 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.23 (registry+https://github.com/rust-lang/crates.io-index)", "objc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "cocoa" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +replace = "cocoa 0.8.1 (git+https://github.com/Eijebong/cocoa-rs.git?branch=bump_graphics)" + [[package]] name = "color_quant" version = "1.0.0" @@ -509,8 +527,8 @@ dependencies = [ "offscreen_gl_context 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "profile_traits 0.0.1", "script_traits 0.0.1", - "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.9.15 (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)", "servo_config 0.0.1", "servo_rand 0.0.1", "servo_remutex 0.0.1", @@ -547,46 +565,52 @@ 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.23 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.9.15 (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.23 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "cssparser" version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/Eijebong/rust-cssparser.git?branch=serde1.0#43d248597662e2eaf6d61c362a8499e9545e4165" dependencies = [ - "cssparser-macros 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cssparser-macros 0.3.0 (git+https://github.com/Eijebong/rust-cssparser.git?branch=serde1.0)", "heapsize 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "phf 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", - "procedural-masquerade 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "procedural-masquerade 0.1.2 (git+https://github.com/Eijebong/rust-cssparser.git?branch=serde1.0)", "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "cssparser" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +replace = "cssparser 0.14.0 (git+https://github.com/Eijebong/rust-cssparser.git?branch=serde1.0)" + [[package]] name = "cssparser-macros" version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/Eijebong/rust-cssparser.git?branch=serde1.0#43d248597662e2eaf6d61c362a8499e9545e4165" dependencies = [ "phf_codegen 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", - "procedural-masquerade 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "procedural-masquerade 0.1.2 (git+https://github.com/Eijebong/rust-cssparser.git?branch=serde1.0)", "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -670,9 +694,9 @@ dependencies = [ "ipc-channel 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", - "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 0.9.10 (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)", + "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -687,8 +711,8 @@ dependencies = [ "hyper_serde 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", - "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.9.15 (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)", "servo_url 0.0.1", "time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -725,17 +749,23 @@ dependencies = [ [[package]] name = "dwrote" version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/Eijebong/dwrote-rs.git?branch=serde1.0#669904b40d9a5575c0fd7ecac52e80ae55c6ee39" 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.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.9.15 (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)", ] +[[package]] +name = "dwrote" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +replace = "dwrote 0.3.0 (git+https://github.com/Eijebong/dwrote-rs.git?branch=serde1.0)" + [[package]] name = "either" version = "1.0.3" @@ -898,14 +928,20 @@ dependencies = [ [[package]] name = "euclid" version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/Eijebong/euclid.git?branch=serde1.0#0e57a0ac9c743a2ad46342abdf869c79e6c95ce6" dependencies = [ "heapsize 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (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.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "euclid" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +replace = "euclid 0.14.4 (git+https://github.com/Eijebong/euclid.git?branch=serde1.0)" + [[package]] name = "expat-sys" version = "2.1.4" @@ -1029,8 +1065,8 @@ dependencies = [ "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-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-text 4.0.0 (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.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.14.4 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1048,8 +1084,8 @@ dependencies = [ "net_traits 0.0.1", "ordered-float 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "range 0.0.1", - "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.9.15 (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)", "servo-fontconfig 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "servo_atoms 0.0.1", "servo_geometry 0.0.1", @@ -1060,7 +1096,7 @@ dependencies = [ "style_traits 0.0.1", "time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", "truetype 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-bidi 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-bidi 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_traits 0.40.0 (git+https://github.com/servo/webrender)", "xi-unicode 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1084,8 +1120,8 @@ dependencies = [ "heapsize 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "range 0.0.1", - "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.9.15 (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)", ] [[package]] @@ -1260,22 +1296,29 @@ dependencies = [ [[package]] name = "hyper_serde" version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/Eijebong/hyper_serde.git?branch=serde1.0#512c60af1725e0f08f5d765ad6350808d7141f2d" dependencies = [ "cookie 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.10.10 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_bytes 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "hyper_serde" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +replace = "hyper_serde 0.6.2 (git+https://github.com/Eijebong/hyper_serde.git?branch=serde1.0)" + [[package]] name = "idna" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "matches 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-bidi 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-bidi 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-normalization 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1334,18 +1377,24 @@ dependencies = [ [[package]] name = "ipc-channel" version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/Eijebong/ipc-channel.git?branch=serde1.0#700e94637bac581bc35dcd6b68143f732df0d591" 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.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.7 (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.15 (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]] +name = "ipc-channel" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +replace = "ipc-channel 0.7.2 (git+https://github.com/Eijebong/ipc-channel.git?branch=serde1.0)" + [[package]] name = "itertools" version = "0.5.10" @@ -1437,16 +1486,16 @@ dependencies = [ "script_layout_interface 0.0.1", "script_traits 0.0.1", "selectors 0.19.0", - "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 0.9.10 (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)", + "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "servo_config 0.0.1", "servo_geometry 0.0.1", "servo_url 0.0.1", "smallvec 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "style_traits 0.0.1", - "unicode-bidi 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-bidi 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_traits 0.40.0 (git+https://github.com/servo/webrender)", ] @@ -1483,8 +1532,8 @@ dependencies = [ "script_layout_interface 0.0.1", "script_traits 0.0.1", "selectors 0.19.0", - "serde_derive 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 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_config 0.0.1", "servo_geometry 0.0.1", "servo_url 0.0.1", @@ -1741,8 +1790,8 @@ dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.9.15 (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)", "webrender_traits 0.40.0 (git+https://github.com/servo/webrender)", ] @@ -1775,9 +1824,9 @@ dependencies = [ "openssl 0.9.12 (registry+https://github.com/rust-lang/crates.io-index)", "parse-hosts 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "profile_traits 0.0.1", - "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 0.9.10 (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)", + "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "servo-websocket 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)", "servo_config 0.0.1", "servo_url 0.0.1", @@ -1786,7 +1835,7 @@ dependencies = [ "tinyfiledialogs 2.5.9 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "uuid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_traits 0.40.0 (git+https://github.com/servo/webrender)", ] @@ -1840,12 +1889,12 @@ dependencies = [ "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "num-traits 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.9.15 (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)", "servo_config 0.0.1", "servo_url 0.0.1", "url 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "uuid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_traits 0.40.0 (git+https://github.com/servo/webrender)", ] @@ -1946,7 +1995,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "offscreen_gl_context" version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/Eijebong/rust-offscreen-rendering-context.git?branch=serde1.0#174c9b2d9c4d6de91b3f0b193ccbf81340661350" 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)", @@ -1959,12 +2008,18 @@ dependencies = [ "libloading 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (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.15 (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.14.0 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "offscreen_gl_context" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +replace = "offscreen_gl_context 0.9.0 (git+https://github.com/Eijebong/rust-offscreen-rendering-context.git?branch=serde1.0)" + [[package]] name = "ogg" version = "0.5.0" @@ -2157,8 +2212,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "procedural-masquerade" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" +version = "0.1.2" +source = "git+https://github.com/Eijebong/rust-cssparser.git?branch=serde1.0#43d248597662e2eaf6d61c362a8499e9545e4165" [[package]] name = "profile" @@ -2170,9 +2225,9 @@ dependencies = [ "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "profile_traits 0.0.1", "regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 0.9.10 (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)", + "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "servo_config 0.0.1", "task_info 0.0.1", "time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2195,8 +2250,8 @@ dependencies = [ "energymon 0.3.0 (git+https://github.com/energymon/energymon-rust.git)", "ipc-channel 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.9.15 (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)", "servo_config 0.0.1", "signpost 0.1.0 (git+https://github.com/pcwalton/signpost.git)", "time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2251,8 +2306,8 @@ dependencies = [ "heapsize 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_derive 0.1.4 (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.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.9.15 (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)", ] [[package]] @@ -2311,17 +2366,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "rust-webvr" version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/Eijebong/rust-webvr.git?branch=serde1.0#b55d27baedf3b166d5677757702e17936cfcb4f1" dependencies = [ "android_injected_glue 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "gl_generator 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "libloading 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.9.15 (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)", "time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "rust-webvr" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +replace = "rust-webvr 0.4.0 (git+https://github.com/Eijebong/rust-webvr.git?branch=serde1.0)" + [[package]] name = "rustc-demangle" version = "0.1.4" @@ -2413,8 +2474,8 @@ dependencies = [ "script_plugins 0.0.1", "script_traits 0.0.1", "selectors 0.19.0", - "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 0.9.10 (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_atoms 0.0.1", "servo_config 0.0.1", "servo_geometry 0.0.1", @@ -2429,7 +2490,7 @@ dependencies = [ "unicode-segmentation 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "utf-8 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "uuid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_traits 0.40.0 (git+https://github.com/servo/webrender)", "webvr 0.0.1", "webvr_traits 0.0.1", @@ -2499,8 +2560,8 @@ dependencies = [ "offscreen_gl_context 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "profile_traits 0.0.1", "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.9.15 (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)", "servo_atoms 0.0.1", "servo_url 0.0.1", "style_traits 0.0.1", @@ -2534,36 +2595,45 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde" -version = "0.9.15" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -name = "serde_codegen_internals" -version = "0.14.2" +name = "serde_bytes" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "serde_derive" -version = "0.9.15" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_codegen_internals 0.14.2 (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_internals" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)", + "synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "serde_json" -version = "0.9.10" +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.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2629,13 +2699,13 @@ dependencies = [ [[package]] name = "servo-glutin" version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/Eijebong/glutin.git?branch=bump_graphics#b4966102e6efac004c113f62530ea3853889646f" dependencies = [ "android_glue 0.2.2 (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.1 (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)", @@ -2652,6 +2722,12 @@ dependencies = [ "x11-dl 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "servo-glutin" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +replace = "servo-glutin 0.10.2 (git+https://github.com/Eijebong/glutin.git?branch=bump_graphics)" + [[package]] name = "servo-skia" version = "0.30000005.3" @@ -2694,7 +2770,7 @@ version = "0.0.1" dependencies = [ "heapsize 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "nodrop 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2717,8 +2793,8 @@ dependencies = [ "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.9.15 (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)", "servo_geometry 0.0.1", "servo_url 0.0.1", "url 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2771,12 +2847,12 @@ version = "0.0.1" dependencies = [ "heapsize 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.9.15 (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)", "servo_rand 0.0.1", "url 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "url_serde 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "uuid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "url_serde 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2851,33 +2927,45 @@ dependencies = [ [[package]] name = "string_cache" version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/Eijebong/string-cache.git?branch=serde1.0#00c836fcb369524ebea5bc58bedfeca1d9f61883" dependencies = [ "debug_unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "phf_shared 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", "precomputed-hash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_codegen 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_codegen 0.4.0 (git+https://github.com/Eijebong/string-cache.git?branch=serde1.0)", + "string_cache_shared 0.3.0 (git+https://github.com/Eijebong/string-cache.git?branch=serde1.0)", ] +[[package]] +name = "string_cache" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +replace = "string_cache 0.5.2 (git+https://github.com/Eijebong/string-cache.git?branch=serde1.0)" + [[package]] name = "string_cache_codegen" version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/Eijebong/string-cache.git?branch=serde1.0#00c836fcb369524ebea5bc58bedfeca1d9f61883" dependencies = [ "phf_generator 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", "phf_shared 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_shared 0.3.0 (git+https://github.com/Eijebong/string-cache.git?branch=serde1.0)", ] +[[package]] +name = "string_cache_codegen" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +replace = "string_cache_codegen 0.4.0 (git+https://github.com/Eijebong/string-cache.git?branch=serde1.0)" + [[package]] name = "string_cache_shared" version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/Eijebong/string-cache.git?branch=serde1.0#00c836fcb369524ebea5bc58bedfeca1d9f61883" [[package]] name = "strsim" @@ -2920,8 +3008,8 @@ dependencies = [ "rayon 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.19.0", - "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.9.15 (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)", "servo_arc 0.0.1", "servo_atoms 0.0.1", "servo_config 0.0.1", @@ -2931,7 +3019,7 @@ dependencies = [ "style_traits 0.0.1", "time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-bidi 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-bidi 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-segmentation 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "walkdir 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2977,8 +3065,8 @@ dependencies = [ "heapsize 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.19.0", - "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.9.15 (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)", ] [[package]] @@ -3197,12 +3285,12 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "matches 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.9.15 (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)", ] [[package]] @@ -3254,10 +3342,10 @@ dependencies = [ [[package]] name = "url_serde" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3285,11 +3373,11 @@ 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)", - "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3345,7 +3433,7 @@ dependencies = [ "servo_config 0.0.1", "servo_url 0.0.1", "url 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "uuid 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "webdriver 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3353,14 +3441,20 @@ dependencies = [ name = "webrender" version = "0.40.0" source = "git+https://github.com/servo/webrender#faed91dd24e695b8c7c555ef3398d0ba8fd165dc" +replace = "webrender 0.40.0 (git+https://github.com/Eijebong/webrender.git?branch=serde1.0)" + +[[package]] +name = "webrender" +version = "0.40.0" +source = "git+https://github.com/Eijebong/webrender.git?branch=serde1.0#c319e56fdeaf1e20185158cd630d23ee204ac8ec" 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)", + "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)", + "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.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.14.4 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3375,27 +3469,33 @@ dependencies = [ "rayon 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "thread_profiler 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", - "webrender_traits 0.40.0 (git+https://github.com/servo/webrender)", + "webrender_traits 0.40.0 (git+https://github.com/Eijebong/webrender.git?branch=serde1.0)", ] [[package]] name = "webrender_traits" version = "0.40.0" source = "git+https://github.com/servo/webrender#faed91dd24e695b8c7c555ef3398d0ba8fd165dc" +replace = "webrender_traits 0.40.0 (git+https://github.com/Eijebong/webrender.git?branch=serde1.0)" + +[[package]] +name = "webrender_traits" +version = "0.40.0" +source = "git+https://github.com/Eijebong/webrender.git?branch=serde1.0#c319e56fdeaf1e20185158cd630d23ee204ac8ec" 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)", + "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)", + "core-graphics 0.8.1 (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)", "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.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 0.9.15 (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)", "time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3521,18 +3621,20 @@ dependencies = [ "checksum angle 0.2.0 (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 antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "34fde25430d87a9388dadbe6e34d7f72a462c8b43ac8d309b42b0a8505d7e2a5" +"checksum app_units 0.4.2 (git+https://github.com/Eijebong/app_units.git?branch=serde1.0)" = "" "checksum app_units 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b03f9404bb507e374418345f5ebeef57b32c35e8cb3c36e58a7d0b73fd063c77" "checksum arraydeque 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "96e774cadb24c2245225280c6799793f9802b918a58a79615e9490607489a717" "checksum arrayvec 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)" = "699e63a93b79d717e8c3b5eb1b28b7780d0d6d9e59a72eb769291c83b0c8dc67" "checksum aster 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ccfdf7355d9db158df68f976ed030ab0f6578af811f5a7bb6dcf221ec24e0e0" "checksum atomic_refcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fb2dcb6e6d35f20276943cc04bb98e538b348d525a04ac79c10021561d202f21" "checksum audio-video-metadata 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3b6ef29ee98ad95a37f34547fd7fb40724772294110ed6ca0445fc2e964c29d1" +"checksum azure 0.17.0 (git+https://github.com/Eijebong/rust-azure.git?branch=serde1.0)" = "" "checksum azure 0.17.0 (git+https://github.com/servo/rust-azure)" = "" "checksum backtrace 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "72f9b4182546f4b04ebc4ab7f84948953a118bd6021a1b6a6c909e3e94f6be76" "checksum backtrace-sys 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "3a0d842ea781ce92be2bf78a9b38883948542749640b8378b3b2f03d1fd9f1ff" "checksum base64 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "30e93c03064e7590d0466209155251b90c22e37fab1daf2771582598b5827557" "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 bindgen 0.25.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e28791695e6e29a82038bd0489a760f362157dc1a3b2bbac9b6be3ddd984ff7" "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" @@ -3558,16 +3660,18 @@ dependencies = [ "checksum clipboard 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "564a8fdbec95bd0a02df93018ed8f55ecf62449a40f731d54caf8c3a84e3e1e6" "checksum clipboard-win 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "693b1280c514045382dfdbb78d1594b1b03cdb66320aeb7ebd2bd38d49bae959" "checksum cmake 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)" = "d18d68987ed4c516dcc3e7913659bfa4076f5182eea4a7e0038bb060953e76ac" +"checksum cocoa 0.8.1 (git+https://github.com/Eijebong/cocoa-rs.git?branch=bump_graphics)" = "" "checksum cocoa 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0a5d0bcb4d345adf9b4ada6c5bb3e2b87c8150b79c46f3f26446de5f4d48de4b" "checksum color_quant 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a475fc4af42d83d28adf72968d9bcfaf035a1a9381642d8e85d8a04957767b0d" "checksum compiletest_rs 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "df47edea8bf052f23ce25a15cbf0be09c96911e3be943d1e81415bfaf0e74bf8" "checksum cookie 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "30b3493e12a550c2f96be785088d1da8d93189e7237c8a8d0d871bc9070334c3" "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 cssparser 0.14.0 (git+https://github.com/Eijebong/rust-cssparser.git?branch=serde1.0)" = "" "checksum cssparser 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4a5ca71edbab09f8dc1e3d1c132717562c3b01c8598ab669183c5195bb1761" -"checksum cssparser-macros 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "079adec4af52bb5275eadd004292028c79eb3c5f5b4ee8086a36d4197032f6df" +"checksum cssparser-macros 0.3.0 (git+https://github.com/Eijebong/rust-cssparser.git?branch=serde1.0)" = "" "checksum dbghelp-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "97590ba53bcb8ac28279161ca943a924d1fd4a8fb3fa63302591647c4fc5b850" "checksum dbus 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4aee01fb76ada3e5e7ca642ea6664ebf7308a810739ca2aca44909a1191ac254" "checksum debug_unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9a032eac705ca39214d169f83e3d3da290af06d8d1d344d1baad2fd002dca4b3" @@ -3576,6 +3680,7 @@ dependencies = [ "checksum device 0.0.1 (git+https://github.com/servo/devices)" = "" "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 (git+https://github.com/Eijebong/dwrote-rs.git?branch=serde1.0)" = "" "checksum dwrote 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "74114b6b49d6731835da7a28a3642651451e315f7f9b9d04e907e65a45681796" "checksum either 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "63f94a35a9ca0d4178e85f0250373f2cea55c5d603e6993778d68a99b3d8071c" "checksum encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" @@ -3594,6 +3699,7 @@ dependencies = [ "checksum env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3ddf21e73e016298f5cb37d6ef8e8da8e39f91f9ec8b0df44b7deb16a9f8cd5b" "checksum error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d9435d864e017c3c6afeac1654189b06cdb491cf2ff73dbf0d73b0f292f42ff8" "checksum error-chain 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "318cb3c71ee4cdea69fdc9e15c173b245ed6063e1709029e8fd32525a881120f" +"checksum euclid 0.14.4 (git+https://github.com/Eijebong/euclid.git?branch=serde1.0)" = "" "checksum euclid 0.14.4 (registry+https://github.com/rust-lang/crates.io-index)" = "995b21c36b37e0f18ed9ba1714378a337e3ff19a6e5e952ea94b0f3dd4e12fbc" "checksum expat-sys 2.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cef36cd1a8a02d28b91d97347c63247b9e4cb8a8e36df36f8201dc87a1c0859c" "checksum flate2 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)" = "36df0166e856739905cd3d7e0b210fe818592211a008862599845e012d8d304c" @@ -3623,6 +3729,7 @@ dependencies = [ "checksum httparse 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a6e7a63e511f9edffbab707141fbb8707d1a3098615fb2adbd5769cdfcc9b17d" "checksum hyper 0.10.10 (registry+https://github.com/rust-lang/crates.io-index)" = "36e108e0b1fa2d17491cbaac4bc460dc0956029d10ccf83c913dd0e5db3e7f07" "checksum hyper-openssl 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "85a372eb692590b3fe014c196c30f9f52d4c42f58cd49dd94caeee1593c9cc37" +"checksum hyper_serde 0.6.2 (git+https://github.com/Eijebong/hyper_serde.git?branch=serde1.0)" = "" "checksum hyper_serde 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a43d985c58afed6b59991932e1d9b5f2629472849f0062c0078d82fdc0b788bb" "checksum idna 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2233d4940b1f19f0418c158509cd7396b8d70a5db5705ce410914dc8fa603b37" "checksum image 0.12.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d95816db758249fe16f23a4e23f1a3a817fe11892dbfd1c5836f625324702158" @@ -3630,6 +3737,7 @@ dependencies = [ "checksum inflate 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e7e0062d2dc2f17d2f13750d95316ae8a2ff909af0fda957084f5defd87c43bb" "checksum io-surface 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c35a3278fa52fb070fdc874dfd057163e6c21e0a9295f87f54daee9dd5530b43" "checksum iovec 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "29d062ee61fccdf25be172e70f34c9f6efc597e1fb8f6526e8437b2046ab26be" +"checksum ipc-channel 0.7.2 (git+https://github.com/Eijebong/ipc-channel.git?branch=serde1.0)" = "" "checksum ipc-channel 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0b7639999a1fb3f63da25d4bc1f6fe9acbdcd127ae8c81caba66e4faf7bb884f" "checksum itertools 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4833d6978da405305126af4ac88569b5d71ff758581ce5a987dbfa3755f694fc" "checksum itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eb2f404fbc66fd9aac13e998248505e7ecb2ad8e44ab6388684c5fb11c6c251c" @@ -3674,6 +3782,7 @@ dependencies = [ "checksum objc-foundation 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" "checksum objc_id 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e4730aa1c64d722db45f7ccc4113a3e2c465d018de6db4d3e7dfe031e8c8a297" "checksum odds 0.2.25 (registry+https://github.com/rust-lang/crates.io-index)" = "c3df9b730298cea3a1c3faa90b7e2f9df3a9c400d0936d6015e6165734eefcba" +"checksum offscreen_gl_context 0.9.0 (git+https://github.com/Eijebong/rust-offscreen-rendering-context.git?branch=serde1.0)" = "" "checksum offscreen_gl_context 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0f2b1feeb87a68541c96e07b8b81a3fef0057b026b5f691b4489852811e76804" "checksum ogg 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7137bf02687385302f4c0aecd77cfce052b69f5b4ee937be778e125c62f67e30" "checksum ogg_metadata 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fc665717454399cba557c55ad226148996e9266ee291f8a37a98bb2cded0a490" @@ -3697,7 +3806,7 @@ dependencies = [ "checksum plane-split 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "da4c13e9ba1388fd628ec2bcd69f3346dec64357e9b552601b244f92189d4610" "checksum png 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3cb773e9a557edb568ce9935cf783e3cdcabe06a9449d41b3e5506d88e582c82" "checksum precomputed-hash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf1fc3616b3ef726a847f2cd2388c646ef6a1f1ba4835c2629004da48184150" -"checksum procedural-masquerade 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9f566249236c6ca4340f7ca78968271f0ed2b0f234007a61b66f9ecd0af09260" +"checksum procedural-masquerade 0.1.2 (git+https://github.com/Eijebong/rust-cssparser.git?branch=serde1.0)" = "" "checksum pulldown-cmark 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1058d7bb927ca067656537eec4e02c2b4b70eaaa129664c5b90c111e20326f41" "checksum quasi 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "18c45c4854d6d1cf5d531db97c75880feb91c958b0720f4ec1057135fec358b3" "checksum quasi_codegen 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "51b9e25fa23c044c1803f43ca59c98dac608976dd04ce799411edd58ece776d4" @@ -3710,6 +3819,7 @@ dependencies = [ "checksum ref_slice 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "825740057197b7d43025e7faf6477eaabc03434e153233da02d1f44602f71527" "checksum regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1731164734096285ec2a5ec7fea5248ae2f5485b3feeb0115af4fda2183b2d1b" "checksum regex-syntax 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ad890a5eef7953f55427c50575c680c42841653abd2b028b68cd223d157f62db" +"checksum rust-webvr 0.4.0 (git+https://github.com/Eijebong/rust-webvr.git?branch=serde1.0)" = "" "checksum rust-webvr 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "263be07c1d462798df737e4dcc6920ac92727340b05985a0328e3a86c9592b19" "checksum rustc-demangle 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3058a43ada2c2d0b92b3ae38007a2d0fa5e9db971be260e0171408a4ff471c95" "checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" @@ -3717,14 +3827,16 @@ dependencies = [ "checksum same-file 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d931a44fdaa43b8637009e7632a02adc4f2b2e0733c08caa4cf00e8da4a117a7" "checksum scoped_threadpool 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "3ef399c8893e8cb7aa9696e895427fab3a6bf265977bb96e126f24ddd2cda85a" "checksum semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "d4f410fedcf71af0345d7607d246e7ad15faaadd49d240ee3b24e5dc21a820ac" -"checksum serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af" -"checksum serde_codegen_internals 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bc888bd283bd2420b16ad0d860e35ad8acb21941180a83a189bb2046f9d00400" -"checksum serde_derive 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "978fd866f4d4872084a81ccc35e275158351d3b9fe620074e7d7504b816b74ba" -"checksum serde_json 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ad8bcf487be7d2e15d3d543f04312de991d631cfe1b43ea0ade69e6a8a5b16a1" +"checksum serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "c2f530d36fb84ec48fb7146936881f026cdbf4892028835fd9398475f82c1bb4" +"checksum serde_bytes 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a73f5ad9bb83e1e407254c7a355f4efdaffe3c1442fc0657ddb8b9b6b225655" +"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-egl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "21069a884c33fe6ee596975e1f3849ed88c4ec857fbaf11d33672d8ebe051217" "checksum servo-fontconfig 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "93f799b649b4a2bf362398910eca35240704c7e765e780349b2bb1070d892262" "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.2 (git+https://github.com/Eijebong/glutin.git?branch=bump_graphics)" = "" "checksum servo-glutin 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8398095f9b3dc3c6d706d395e192624be1f1bcc6f366b009fe17a20cb5dd3d72" "checksum servo-skia 0.30000005.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3047c224334358fd376b04b83454a7e9f5473c131c3e24db156a99251e495e3c" "checksum servo-websocket 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8a1ff13c5d852c2793805226e688044309f2c1d8f063784805a13e99cb75b611" @@ -3738,9 +3850,11 @@ dependencies = [ "checksum skeptic 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dd7d8dc1315094150052d0ab767840376335a98ac66ef313ff911cdf439a5b69" "checksum slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "17b4fcaed89ab08ef143da37bc52adbcc04d4a69014f4c1208d6b51f0c47bc23" "checksum smallvec 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2e40af10aafe98b4d8294ae8388d8a5cd0707c65d364872efe72d063ec44bee0" +"checksum string_cache 0.5.2 (git+https://github.com/Eijebong/string-cache.git?branch=serde1.0)" = "" "checksum string_cache 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7c8ba7515dd502b75080d989b819d31fb72686a82320d8006f665003c42ef79" +"checksum string_cache_codegen 0.4.0 (git+https://github.com/Eijebong/string-cache.git?branch=serde1.0)" = "" "checksum string_cache_codegen 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "479cde50c3539481f33906a387f2bd17c8e87cb848c35b6021d41fb81ff9b4d7" -"checksum string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b1884d1bc09741d466d9b14e6d37ac89d6909cbcac41dd9ae982d4d063bbedfc" +"checksum string_cache_shared 0.3.0 (git+https://github.com/Eijebong/string-cache.git?branch=serde1.0)" = "" "checksum strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b4d15c810519a91cf877e7e36e63fe068815c678181439f2f29e2562147c3694" "checksum swapper 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca610b32bb8bfc5e7f705480c3a1edfeb70b6582495d343872c8bee0dcf758c" "checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" @@ -3765,7 +3879,7 @@ dependencies = [ "checksum truetype 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)" = "acec30350633d6dac9dc1a625786b6cbe9150664be941aac2c35ad7199eab877" "checksum typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887" "checksum unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "13a5906ca2b98c799f4b1ab4557b76367ebd6ae5ef14930ec841c74aed5f3764" -"checksum unicode-bidi 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "916219eb752dd865717c9b21064401c6ee843dc91ed659c144591e0c87c56d59" +"checksum unicode-bidi 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a6a2c4e3710edd365cd7e78383153ed739fa31af19f9172f72d3575060f5a43a" "checksum unicode-normalization 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "e28fa37426fceeb5cf8f41ee273faa7c82c47dc8fba5853402841e665fcd86ff" "checksum unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e5430ae21ef212551680d0021fc7dbd936e8b268c5ea8fdae8814e0b2496d80f" "checksum unicode-segmentation 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a8083c594e02b8ae1654ae26f0ade5158b119bd88ad0e8227a5d8fcd72407946" @@ -3773,16 +3887,18 @@ dependencies = [ "checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" "checksum unreachable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1f2ae5ddb18e1c92664717616dd9549dde73f539f01bd7b77c2edb2446bdff91" "checksum url 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3e2ba3456fbe5c0098cb877cf08b92b76c3e18e0be9e47c35b487220d377d24e" -"checksum url_serde 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "64ddbc0a67ae30778179166934129e0aeb92c5b7051d8e0b519e3bce73aff106" +"checksum url_serde 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "74e7d099f1ee52f823d4bdd60c93c3602043c728f5db3b97bdb548467f7bddea" "checksum user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ef4711d107b21b410a3a974b1204d9accc8b10dad75d8324b5d755de1617d47" "checksum utf-8 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b6f923c601c7ac48ef1d66f7d5b5b2d9a7ba9c51333ab75a3ddf8d0309185a56" "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 walkdir 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "bb08f9e670fab86099470b97cd2b252d6527f0b3cc1401acdb595ffc9dd288ff" "checksum webdriver 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d548aabf87411b1b4ba91fd07eacd8b238135c7131a452b8a9f6386209167e18" +"checksum webrender 0.40.0 (git+https://github.com/Eijebong/webrender.git?branch=serde1.0)" = "" "checksum webrender 0.40.0 (git+https://github.com/servo/webrender)" = "" +"checksum webrender_traits 0.40.0 (git+https://github.com/Eijebong/webrender.git?branch=serde1.0)" = "" "checksum webrender_traits 0.40.0 (git+https://github.com/servo/webrender)" = "" "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" diff --git a/Cargo.toml b/Cargo.toml index 25a76e5d167b..9dc2501b2a5e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,3 +19,18 @@ opt-level = 3 # crate, add that here. Use the form: # # ":" = { path = "/path/to/local/checkout" } +"app_units:0.4.2" = { git = "https://github.com/Eijebong/app_units.git", branch = "serde1.0" } +"https://github.com/servo/webrender#0.40.0" = { git = "https://github.com/Eijebong/webrender.git", branch = "serde1.0" } +"https://github.com/servo/webrender#webrender_traits:0.40.0" = { git = "https://github.com/Eijebong/webrender.git", branch = "serde1.0" } +"cssparser:0.14.0" = {git = "https://github.com/Eijebong/rust-cssparser.git", branch = "serde1.0" } +"string_cache:0.5.2" = { git = "https://github.com/Eijebong/string-cache.git", branch = "serde1.0" } +"string_cache_codegen:0.4.0" = { git = "https://github.com/Eijebong/string-cache.git", branch = "serde1.0" } +"offscreen_gl_context:0.9.0" = { git = "https://github.com/Eijebong/rust-offscreen-rendering-context.git", branch = "serde1.0" } +"dwrote:0.3.0" = { git = "https://github.com/Eijebong/dwrote-rs.git", branch = "serde1.0" } +"euclid:0.14.4" = { git = "https://github.com/Eijebong/euclid.git", branch = "serde1.0" } +"ipc-channel:0.7.2" = { git = "https://github.com/Eijebong/ipc-channel.git", branch = "serde1.0" } +"servo-glutin:0.10.2" = { git = "https://github.com/Eijebong/glutin.git", branch = "bump_graphics" } +"https://github.com/servo/rust-azure#azure:0.17.0" = { git = "https://github.com/Eijebong/rust-azure.git", branch = "serde1.0" } +"hyper_serde:0.6.2" = { git = "https://github.com/Eijebong/hyper_serde.git", branch = "serde1.0" } +"cocoa:0.8.1" = { git = "https://github.com/Eijebong/cocoa-rs.git", branch = "bump_graphics" } +"rust-webvr:0.4.0" = { git = "https://github.com/Eijebong/rust-webvr.git", branch = "serde1.0" } diff --git a/components/bluetooth/Cargo.toml b/components/bluetooth/Cargo.toml index e0b4939a5eab..66aee94edcc2 100644 --- a/components/bluetooth/Cargo.toml +++ b/components/bluetooth/Cargo.toml @@ -16,7 +16,7 @@ device = {git = "https://github.com/servo/devices", features = ["bluetooth-test" ipc-channel = "0.7" servo_config = {path = "../config"} servo_rand = {path = "../rand"} -uuid = {version = "0.4", features = ["v4"]} +uuid = {version = "0.5", features = ["v4"]} [target.'cfg(target_os = "linux")'.dependencies] tinyfiledialogs = "2.5.9" diff --git a/components/bluetooth_traits/Cargo.toml b/components/bluetooth_traits/Cargo.toml index 59238f61bce8..2f8f96b0260a 100644 --- a/components/bluetooth_traits/Cargo.toml +++ b/components/bluetooth_traits/Cargo.toml @@ -12,6 +12,6 @@ path = "lib.rs" [dependencies] ipc-channel = "0.7" regex = "0.2" -serde = "0.9" -serde_derive = "0.9" +serde = "1.0" +serde_derive = "1.0" servo_config = {path = "../config"} diff --git a/components/canvas_traits/Cargo.toml b/components/canvas_traits/Cargo.toml index 81f463ae2aa4..98c5b599f375 100644 --- a/components/canvas_traits/Cargo.toml +++ b/components/canvas_traits/Cargo.toml @@ -15,6 +15,6 @@ euclid = "0.14.4" heapsize = "0.4" heapsize_derive = "0.1" ipc-channel = "0.7" -serde = "0.9" -serde_derive = "0.9" +serde = "1.0" +serde_derive = "1.0" webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]} diff --git a/components/config/Cargo.toml b/components/config/Cargo.toml index 804633d949eb..27f0db3032a3 100644 --- a/components/config/Cargo.toml +++ b/components/config/Cargo.toml @@ -16,8 +16,8 @@ lazy_static = "0.2" log = "0.3.5" num_cpus = "1.1.0" rustc-serialize = "0.3" -serde = {version = "0.9"} -serde_derive = {version = "0.9"} +serde = "1.0" +serde_derive = "1.0" servo_geometry = {path = "../geometry"} servo_url = {path = "../url"} url = "1.2" diff --git a/components/constellation/Cargo.toml b/components/constellation/Cargo.toml index ccb9fb37adf4..4904048d586e 100644 --- a/components/constellation/Cargo.toml +++ b/components/constellation/Cargo.toml @@ -32,8 +32,8 @@ net_traits = {path = "../net_traits"} offscreen_gl_context = { version = "0.9", features = ["serde"] } profile_traits = {path = "../profile_traits"} script_traits = {path = "../script_traits"} -serde = "0.9" -serde_derive = "0.9" +serde = "1.0" +serde_derive = "1.0" style_traits = {path = "../style_traits"} servo_config = {path = "../config"} servo_rand = {path = "../rand"} diff --git a/components/constellation/constellation.rs b/components/constellation/constellation.rs index f4f07c5ea844..aa5de0c95dee 100644 --- a/components/constellation/constellation.rs +++ b/components/constellation/constellation.rs @@ -479,7 +479,7 @@ const WARNINGS_BUFFER_SIZE: usize = 32; /// but does not panic on deserializtion errors. fn route_ipc_receiver_to_new_mpsc_receiver_preserving_errors(ipc_receiver: IpcReceiver) -> Receiver> - where T: Deserialize + Serialize + Send + 'static + where T: for<'de> Deserialize<'de> + Serialize + Send + 'static { let (mpsc_sender, mpsc_receiver) = channel(); ROUTER.add_route(ipc_receiver.to_opaque(), Box::new(move |message| { diff --git a/components/devtools/Cargo.toml b/components/devtools/Cargo.toml index 067d7750470d..7e435e13de5f 100644 --- a/components/devtools/Cargo.toml +++ b/components/devtools/Cargo.toml @@ -16,7 +16,7 @@ hyper_serde = "0.6" ipc-channel = "0.7" log = "0.3.5" msg = {path = "../msg"} -serde = "0.9" -serde_derive = "0.9" -serde_json = "0.9" +serde = "1.0" +serde_derive = "1.0" +serde_json = "1.0" time = "0.1" diff --git a/components/devtools_traits/Cargo.toml b/components/devtools_traits/Cargo.toml index 227b4038c005..3791d0396c88 100644 --- a/components/devtools_traits/Cargo.toml +++ b/components/devtools_traits/Cargo.toml @@ -17,7 +17,7 @@ hyper = "0.10" hyper_serde = "0.6" ipc-channel = "0.7" msg = {path = "../msg"} -serde = "0.9" -serde_derive = "0.9" +serde = "1.0" +serde_derive = "1.0" servo_url = {path = "../url"} time = "0.1" diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml index 673bff6fee55..5891b41b09ab 100644 --- a/components/gfx/Cargo.toml +++ b/components/gfx/Cargo.toml @@ -28,8 +28,8 @@ msg = {path = "../msg"} net_traits = {path = "../net_traits"} ordered-float = "0.4" range = {path = "../range"} -serde = "0.9" -serde_derive = "0.9" +serde = "1.0" +serde_derive = "1.0" servo_atoms = {path = "../atoms"} servo_geometry = {path = "../geometry"} servo_url = {path = "../url"} @@ -45,8 +45,8 @@ xi-unicode = "0.1.0" [target.'cfg(target_os = "macos")'.dependencies] byteorder = "1.0" core-foundation = "0.3" -core-graphics = "0.7" -core-text = "4.0" +core-graphics = "0.8" +core-text = "5.0" [target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies] freetype = "0.2" diff --git a/components/gfx/platform/macos/font_template.rs b/components/gfx/platform/macos/font_template.rs index d731347d798e..52d1b4fce57f 100644 --- a/components/gfx/platform/macos/font_template.rs +++ b/components/gfx/platform/macos/font_template.rs @@ -128,12 +128,12 @@ impl Serialize for CachedCTFont { } } -impl Deserialize for CachedCTFont { +impl<'de> Deserialize<'de> for CachedCTFont { fn deserialize(deserializer: D) -> Result - where D: Deserializer { + where D: Deserializer<'de> { struct NoneOptionVisitor; - impl Visitor for NoneOptionVisitor { + impl<'de> Visitor<'de> for NoneOptionVisitor { type Value = CachedCTFont; fn expecting(&self, fmt: &mut fmt::Formatter) -> fmt::Result { diff --git a/components/gfx_traits/Cargo.toml b/components/gfx_traits/Cargo.toml index f5c91d180e4b..ed62c5e0ca04 100644 --- a/components/gfx_traits/Cargo.toml +++ b/components/gfx_traits/Cargo.toml @@ -13,5 +13,5 @@ path = "lib.rs" heapsize = "0.4" heapsize_derive = "0.1" range = {path = "../range"} -serde = "0.9" -serde_derive = "0.9" +serde = "1.0" +serde_derive = "1.0" diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml index a08ee6c83878..73f12b8fb3e7 100644 --- a/components/layout/Cargo.toml +++ b/components/layout/Cargo.toml @@ -33,10 +33,10 @@ rayon = "0.7.1" script_layout_interface = {path = "../script_layout_interface"} script_traits = {path = "../script_traits"} selectors = { path = "../selectors" } -serde = "0.9" -serde_derive = "0.9" +serde = "1.0" +serde_derive = "1.0" servo_geometry = {path = "../geometry"} -serde_json = "0.9" +serde_json = "1.0" servo_config = {path = "../config"} servo_url = {path = "../url"} smallvec = "0.4" diff --git a/components/layout_thread/Cargo.toml b/components/layout_thread/Cargo.toml index 242dd6411e51..c65e845110e2 100644 --- a/components/layout_thread/Cargo.toml +++ b/components/layout_thread/Cargo.toml @@ -30,8 +30,8 @@ script = {path = "../script"} script_layout_interface = {path = "../script_layout_interface"} script_traits = {path = "../script_traits"} selectors = { path = "../selectors" } -serde_derive = "0.9" -serde_json = "0.9" +serde_derive = "1.0" +serde_json = "1.0" servo_config = {path = "../config"} servo_geometry = {path = "../geometry"} servo_url = {path = "../url"} diff --git a/components/msg/Cargo.toml b/components/msg/Cargo.toml index 4547152404af..e852dadad465 100644 --- a/components/msg/Cargo.toml +++ b/components/msg/Cargo.toml @@ -13,6 +13,6 @@ path = "lib.rs" bitflags = "0.7" heapsize = "0.4" heapsize_derive = "0.1" -serde = "0.9" -serde_derive = "0.9" +serde = "1.0" +serde_derive = "1.0" webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]} diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml index 9833f2562133..095c280438d4 100644 --- a/components/net/Cargo.toml +++ b/components/net/Cargo.toml @@ -30,9 +30,9 @@ net_traits = {path = "../net_traits"} openssl = "0.9" parse-hosts = "0.3.0" profile_traits = {path = "../profile_traits"} -serde = "0.9" -serde_derive = "0.9" -serde_json = "0.9" +serde = "1.0" +serde_derive = "1.0" +serde_json = "1.0" servo_config = {path = "../config"} servo_url = {path = "../url"} servo-websocket = "0.19" @@ -40,7 +40,7 @@ threadpool = "1.0" time = "0.1.17" unicase = "1.4.0" url = {version = "1.2", features = ["heap_size"]} -uuid = {version = "0.4", features = ["v4"]} +uuid = {version = "0.5", features = ["v4"]} webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]} [target.'cfg(any(target_os = "macos", target_os = "linux", target_os = "windows"))'.dependencies] diff --git a/components/net/resource_thread.rs b/components/net/resource_thread.rs index 0b1ce39747f2..8d1c3b757645 100644 --- a/components/net/resource_thread.rs +++ b/components/net/resource_thread.rs @@ -214,7 +214,7 @@ impl ResourceChannelManager { } pub fn read_json_from_file(data: &mut T, config_dir: &Path, filename: &str) - where T: Deserialize + where T: for<'de> Deserialize<'de> { let path = config_dir.join(filename); let display = path.display(); diff --git a/components/net_traits/Cargo.toml b/components/net_traits/Cargo.toml index 08f602fc4ad0..d13564107ae4 100644 --- a/components/net_traits/Cargo.toml +++ b/components/net_traits/Cargo.toml @@ -22,10 +22,10 @@ lazy_static = "0.2" log = "0.3.5" msg = {path = "../msg"} num-traits = "0.1.32" -serde = "0.9" -serde_derive = "0.9" +serde = "1.0" +serde_derive = "1.0" servo_config = {path = "../config"} servo_url = {path = "../url"} url = {version = "1.2", features = ["heap_size"]} -uuid = {version = "0.4", features = ["v4", "serde"]} +uuid = {version = "0.5", features = ["v4", "serde"]} webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]} diff --git a/components/net_traits/lib.rs b/components/net_traits/lib.rs index 42808737db82..b912918bc3ae 100644 --- a/components/net_traits/lib.rs +++ b/components/net_traits/lib.rs @@ -270,7 +270,7 @@ pub type IpcSendResult = Result<(), IpcError>; /// used by net_traits::ResourceThreads to ease the use its IpcSender sub-fields /// XXX: If this trait will be used more in future, some auto derive might be appealing pub trait IpcSend - where T: serde::Serialize + serde::Deserialize, + where T: serde::Serialize + for<'de> serde::Deserialize<'de>, { /// send message T fn send(&self, T) -> IpcSendResult; diff --git a/components/profile/Cargo.toml b/components/profile/Cargo.toml index fc8627e1a947..638d0588284b 100644 --- a/components/profile/Cargo.toml +++ b/components/profile/Cargo.toml @@ -14,9 +14,9 @@ profile_traits = {path = "../profile_traits"} ipc-channel = "0.7" heartbeats-simple = "0.4" log = "0.3.5" -serde = "0.9" -serde_derive = "0.9" -serde_json = "0.9" +serde = "1.0" +serde_derive = "1.0" +serde_json = "1.0" servo_config = {path = "../config"} time = "0.1.12" diff --git a/components/profile_traits/Cargo.toml b/components/profile_traits/Cargo.toml index ab85d396960f..92aa963cb5a1 100644 --- a/components/profile_traits/Cargo.toml +++ b/components/profile_traits/Cargo.toml @@ -17,8 +17,8 @@ energy-monitor = {version = "0.2.0", optional = true} energymon = {git = "https://github.com/energymon/energymon-rust.git", optional = true} ipc-channel = "0.7" log = "0.3.5" -serde = "0.9" -serde_derive = "0.9" +serde = "1.0" +serde_derive = "1.0" servo_config = {path = "../config"} signpost = {git = "https://github.com/pcwalton/signpost.git"} time = "0.1.12" diff --git a/components/range/Cargo.toml b/components/range/Cargo.toml index 6742ae9648b1..26dddf3d1e8a 100644 --- a/components/range/Cargo.toml +++ b/components/range/Cargo.toml @@ -14,5 +14,5 @@ path = "lib.rs" heapsize = "0.4" heapsize_derive = "0.1" num-traits = "0.1.32" -serde = "0.9" -serde_derive = "0.9" +serde = "1.0" +serde_derive = "1.0" diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index 77ec98958cbf..a2e6521c2a5b 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -18,7 +18,7 @@ debugmozjs = ['js/debugmozjs'] cmake = "0.1" phf_codegen = "0.7.18" phf_shared = "0.7.18" -serde_json = "0.9" +serde_json = "1.0" [target.'cfg(any(target_os = "macos", target_os = "linux", target_os = "windows"))'.dependencies] tinyfiledialogs = "2.5.9" @@ -76,7 +76,7 @@ script_layout_interface = {path = "../script_layout_interface"} script_plugins = {path = "../script_plugins"} script_traits = {path = "../script_traits"} selectors = { path = "../selectors" } -serde = "0.9" +serde = "1.0" servo_atoms = {path = "../atoms"} servo_config = {path = "../config"} servo_geometry = {path = "../geometry" } @@ -90,7 +90,7 @@ time = "0.1.12" unicode-segmentation = "1.1.0" url = {version = "1.2", features = ["heap_size", "query_encoding"]} utf-8 = "0.7" -uuid = {version = "0.4", features = ["v4"]} +uuid = {version = "0.5", features = ["v4"]} xml5ever = {version = "0.7", features = ["unstable"]} webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]} webvr = {path = "../webvr"} diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs index 67e65c6a4b05..6fa16b2c6039 100644 --- a/components/script/dom/bindings/trace.rs +++ b/components/script/dom/bindings/trace.rs @@ -405,7 +405,7 @@ unsafe impl JSTraceable for fn(A) -> B { } } -unsafe impl JSTraceable for IpcSender where T: Deserialize + Serialize { +unsafe impl JSTraceable for IpcSender where T: for<'de> Deserialize<'de> + Serialize { #[inline] unsafe fn trace(&self, _: *mut JSTracer) { // Do nothing @@ -427,7 +427,7 @@ unsafe impl JSTraceable for () { } } -unsafe impl JSTraceable for IpcReceiver where T: Deserialize + Serialize { +unsafe impl JSTraceable for IpcReceiver where T: for<'de> Deserialize<'de> + Serialize { #[inline] unsafe fn trace(&self, _: *mut JSTracer) { // Do nothing diff --git a/components/script_traits/Cargo.toml b/components/script_traits/Cargo.toml index ddcf1a3765f2..a3c895377aec 100644 --- a/components/script_traits/Cargo.toml +++ b/components/script_traits/Cargo.toml @@ -28,8 +28,8 @@ net_traits = {path = "../net_traits"} offscreen_gl_context = { version = "0.9", features = ["serde"] } profile_traits = {path = "../profile_traits"} rustc-serialize = "0.3.4" -serde = "0.9" -serde_derive = "0.9" +serde = "1.0" +serde_derive = "1.0" servo_atoms = {path = "../atoms"} servo_url = {path = "../url"} style_traits = {path = "../style_traits", features = ["servo"]} diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs index 752d4e48b0a9..a8eaa0310ccc 100644 --- a/components/script_traits/lib.rs +++ b/components/script_traits/lib.rs @@ -96,8 +96,8 @@ impl Serialize for UntrustedNodeAddress { } } -impl Deserialize for UntrustedNodeAddress { - fn deserialize(d: D) -> Result { +impl<'de> Deserialize<'de> for UntrustedNodeAddress { + fn deserialize>(d: D) -> Result { let value: usize = try!(Deserialize::deserialize(d)); Ok(UntrustedNodeAddress::from_id(value)) } diff --git a/components/servo_arc/Cargo.toml b/components/servo_arc/Cargo.toml index ffb743bd20ab..8f73bd618100 100644 --- a/components/servo_arc/Cargo.toml +++ b/components/servo_arc/Cargo.toml @@ -14,5 +14,5 @@ servo = ["serde", "heapsize"] [dependencies] heapsize = {version = "0.4.0", optional = true} -serde = {version = "0.9", optional = true} +serde = {version = "1.0", optional = true} nodrop = {version = "0.1.8"} diff --git a/components/servo_arc/lib.rs b/components/servo_arc/lib.rs index 4fbc094d0709..03f502df26e3 100644 --- a/components/servo_arc/lib.rs +++ b/components/servo_arc/lib.rs @@ -447,11 +447,11 @@ impl HeapSizeOf for Arc { } #[cfg(feature = "servo")] -impl Deserialize for Arc +impl<'de, T: Deserialize<'de>> Deserialize<'de> for Arc { fn deserialize(deserializer: D) -> Result, D::Error> where - D: ::serde::de::Deserializer, + D: ::serde::de::Deserializer<'de>, { T::deserialize(deserializer).map(Arc::new) } diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml index 0c8d02f510f6..06027ffd192a 100644 --- a/components/style/Cargo.toml +++ b/components/style/Cargo.toml @@ -59,9 +59,9 @@ pdqsort = "0.1.0" precomputed-hash = "0.1" rayon = "0.7.1" selectors = { path = "../selectors" } -serde = {version = "0.9", optional = true} -serde_derive = {version = "0.9", optional = true} servo_arc = { path = "../servo_arc" } +serde = {version = "1.0", optional = true} +serde_derive = {version = "1.0", optional = true} servo_atoms = {path = "../atoms", optional = true} servo_config = {path = "../config", optional = true} smallvec = "0.4" diff --git a/components/style_traits/Cargo.toml b/components/style_traits/Cargo.toml index 62a6a44337cf..dbb155ba586b 100644 --- a/components/style_traits/Cargo.toml +++ b/components/style_traits/Cargo.toml @@ -22,5 +22,5 @@ euclid = "0.14.4" heapsize = {version = "0.4", optional = true} heapsize_derive = {version = "0.1", optional = true} selectors = { path = "../selectors" } -serde = {version = "0.9", optional = true} -serde_derive = {version = "0.9", optional = true} +serde = {version = "1.0", optional = true} +serde_derive = {version = "1.0", optional = true} diff --git a/components/url/Cargo.toml b/components/url/Cargo.toml index 42b6cc63150f..1f3d24284491 100644 --- a/components/url/Cargo.toml +++ b/components/url/Cargo.toml @@ -12,9 +12,9 @@ path = "lib.rs" [dependencies] heapsize = {version = "0.4"} heapsize_derive = {version = "0.1"} -serde = {version = "0.9"} -serde_derive = {version = "0.9"} +serde = {version = "1.0"} +serde_derive = {version = "1.0"} servo_rand = {path = "../rand"} url = {version = "1.2", features = ["heap_size"]} -url_serde = {version = "0.1.3"} -uuid = {version = "0.4.0", features = ["v4", "serde"]} +url_serde = {version = "0.2"} +uuid = {version = "0.5.0", features = ["v4", "serde"]} diff --git a/components/url/lib.rs b/components/url/lib.rs index d3ae836bb741..0df3b92fb90f 100644 --- a/components/url/lib.rs +++ b/components/url/lib.rs @@ -209,9 +209,9 @@ impl serde::Serialize for ServoUrl { } } -impl serde::Deserialize for ServoUrl { +impl<'de> serde::Deserialize<'de> for ServoUrl { fn deserialize(deserializer: D) -> Result - where D: serde::Deserializer, + where D: serde::Deserializer<'de>, { url_serde::deserialize(deserializer).map(Self::from_url) } diff --git a/components/webdriver_server/Cargo.toml b/components/webdriver_server/Cargo.toml index cf835159f7ad..cb34c97069f4 100644 --- a/components/webdriver_server/Cargo.toml +++ b/components/webdriver_server/Cargo.toml @@ -25,5 +25,5 @@ script_traits = {path = "../script_traits"} servo_config = {path = "../config"} servo_url = {path = "../url"} url = {version = "1.2", features = ["heap_size"]} -uuid = {version = "0.4", features = ["v4"]} +uuid = {version = "0.5", features = ["v4"]} webdriver = "0.22" diff --git a/components/webvr_traits/Cargo.toml b/components/webvr_traits/Cargo.toml index 2d5ae1527836..9e0f96b3bccd 100644 --- a/components/webvr_traits/Cargo.toml +++ b/components/webvr_traits/Cargo.toml @@ -13,5 +13,5 @@ path = "lib.rs" ipc-channel = "0.7" msg = {path = "../msg"} rust-webvr = {version = "0.4", features = ["serde-serialization"]} -serde = "0.9" -serde_derive = "0.9" +serde = "1.0" +serde_derive = "1.0"