From a0afa66dbe81f4ef3eb1269b6c0594439bedf155 Mon Sep 17 00:00:00 2001 From: Alan Jeffrey Date: Fri, 15 Sep 2017 11:40:47 -0500 Subject: [PATCH 1/2] Upgraded to serde v1.0.14. --- Cargo.lock | 98 +++++++++++++++++++++++++++--------------------------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 346e0fbcb5a..8ff7d9c2145 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5,7 +5,7 @@ dependencies = [ "ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "rust-webvr-api 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -63,7 +63,7 @@ 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 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -159,7 +159,7 @@ 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 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -245,7 +245,7 @@ version = "0.0.1" dependencies = [ "ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", "servo_config 0.0.1", ] @@ -350,7 +350,7 @@ dependencies = [ "ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "offscreen_gl_context 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", "servo_config 0.0.1", "webrender_api 0.50.0 (git+https://github.com/servo/webrender)", ] @@ -534,7 +534,7 @@ dependencies = [ "net_traits 0.0.1", "profile_traits 0.0.1", "script_traits 0.0.1", - "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", "servo_config 0.0.1", "servo_rand 0.0.1", "servo_remutex 0.0.1", @@ -602,7 +602,7 @@ dependencies = [ "phf 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", "procedural-masquerade 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -720,7 +720,7 @@ dependencies = [ "ipc-channel 0.8.0 (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 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.14 (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)", ] @@ -736,7 +736,7 @@ dependencies = [ "hyper_serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", - "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.14 (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)", ] @@ -784,8 +784,8 @@ dependencies = [ "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 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 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -956,7 +956,7 @@ 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 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1124,7 +1124,7 @@ 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 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", "servo-fontconfig 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "servo_arc 0.0.1", "servo_atoms 0.0.1", @@ -1160,7 +1160,7 @@ 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 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1350,7 +1350,7 @@ 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 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.14 (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)", ] @@ -1442,7 +1442,7 @@ dependencies = [ "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1537,7 +1537,7 @@ dependencies = [ "script_layout_interface 0.0.1", "script_traits 0.0.1", "selectors 0.19.0", - "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "servo_arc 0.0.1", "servo_atoms 0.0.1", @@ -1910,7 +1910,7 @@ 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 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", "webrender_api 0.50.0 (git+https://github.com/servo/webrender)", ] @@ -1950,7 +1950,7 @@ dependencies = [ "openssl 0.9.12 (registry+https://github.com/rust-lang/crates.io-index)", "parse-hosts 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "profile_traits 0.0.1", - "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.14 (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", @@ -2013,7 +2013,7 @@ 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 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", "servo_config 0.0.1", "servo_url 0.0.1", "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2131,7 +2131,7 @@ 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 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.14 (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)", @@ -2350,7 +2350,7 @@ 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 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.14 (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", @@ -2374,7 +2374,7 @@ dependencies = [ "energymon 0.3.0 (git+https://github.com/energymon/energymon-rust.git)", "ipc-channel 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.14 (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)", @@ -2438,7 +2438,7 @@ 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 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2512,8 +2512,8 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "android_injected_glue 0.2.2 (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 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2611,7 +2611,7 @@ dependencies = [ "script_plugins 0.0.1", "script_traits 0.0.1", "selectors 0.19.0", - "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "servo_arc 0.0.1", "servo_atoms 0.0.1", @@ -2698,7 +2698,7 @@ dependencies = [ "net_traits 0.0.1", "profile_traits 0.0.1", "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", "servo_atoms 0.0.1", "servo_url 0.0.1", "style_traits 0.0.1", @@ -2734,10 +2734,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde" -version = "1.0.8" +version = "1.0.14" 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)", + "serde_derive 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2745,22 +2745,22 @@ name = "serde_bytes" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "serde_derive" -version = "1.0.8" +version = "1.0.14" 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_derive_internals 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive_internals 0.16.0 (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" +version = "0.16.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)", @@ -2775,7 +2775,7 @@ 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 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2907,7 +2907,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 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", "stable_deref_trait 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2931,7 +2931,7 @@ 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 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", "servo_geometry 0.0.1", "servo_url 0.0.1", "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2984,7 +2984,7 @@ 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 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", "servo_rand 0.0.1", "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "url_serde 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3080,7 +3080,7 @@ dependencies = [ "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 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.14 (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)", ] @@ -3146,7 +3146,7 @@ dependencies = [ "rayon 0.8.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 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", "servo_arc 0.0.1", "servo_atoms 0.0.1", "servo_config 0.0.1", @@ -3207,7 +3207,7 @@ dependencies = [ "malloc_size_of 0.0.1", "malloc_size_of_derive 0.0.1", "selectors 0.19.0", - "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", "servo_atoms 0.0.1", "webrender_api 0.50.0 (git+https://github.com/servo/webrender)", ] @@ -3434,8 +3434,8 @@ 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 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 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3491,7 +3491,7 @@ name = "url_serde" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3523,7 +3523,7 @@ 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 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3631,7 +3631,7 @@ dependencies = [ "fxhash 0.2.1 (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.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3970,10 +3970,10 @@ dependencies = [ "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 semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "d4f410fedcf71af0345d7607d246e7ad15faaadd49d240ee3b24e5dc21a820ac" -"checksum serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "c2f530d36fb84ec48fb7146936881f026cdbf4892028835fd9398475f82c1bb4" +"checksum serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "bcb6a7637a47663ee073391a139ed07851f27ed2532c2abc88c6bf27a16cdf34" "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_derive 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "812ff66056fd9a9a5b7c119714243b0862cf98340e7d4b5ee05a932c40d5ea6c" +"checksum serde_derive_internals 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bd381f6d01a6616cdba8530492d453b7761b456ba974e98768a18cad2cd76f58" "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" From 6754b2834fdcd2c2eb7a1879cb045b73938d11ff Mon Sep 17 00:00:00 2001 From: Alan Jeffrey Date: Fri, 15 Sep 2017 11:50:30 -0500 Subject: [PATCH 2/2] Made PipelineId non-zero, so optional ids take no more space. --- Cargo.lock | 9 ++++++++ components/compositing/compositor.rs | 3 ++- components/compositing/lib.rs | 2 ++ components/msg/Cargo.toml | 2 +- components/msg/constellation_msg.rs | 33 ++++++++++++++++------------ components/msg/lib.rs | 6 ++++- ports/servo/Cargo.toml | 1 + tests/unit/metrics/paint_time.rs | 20 ++++------------- tests/unit/msg/Cargo.toml | 14 ++++++++++++ tests/unit/msg/lib.rs | 8 +++++++ tests/unit/msg/size_of.rs | 14 ++++++++++++ 11 files changed, 79 insertions(+), 33 deletions(-) create mode 100644 tests/unit/msg/Cargo.toml create mode 100644 tests/unit/msg/lib.rs create mode 100644 tests/unit/msg/size_of.rs diff --git a/Cargo.lock b/Cargo.lock index 8ff7d9c2145..4474fc8f4c8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1914,6 +1914,14 @@ dependencies = [ "webrender_api 0.50.0 (git+https://github.com/servo/webrender)", ] +[[package]] +name = "msg_tests" +version = "0.0.1" +dependencies = [ + "msg 0.0.1", + "size_of_test 0.0.1", +] + [[package]] name = "multistr" version = "0.5.1" @@ -2792,6 +2800,7 @@ dependencies = [ "libservo 0.0.1", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "metrics_tests 0.0.1", + "msg_tests 0.0.1", "net_tests 0.0.1", "net_traits_tests 0.0.1", "plugin_compiletest 0.0.1", diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs index 11cff035a30..c3388da6f77 100644 --- a/components/compositing/compositor.rs +++ b/components/compositing/compositor.rs @@ -6,6 +6,7 @@ use CompositionPipeline; use SendableFrameTree; use compositor_thread::{CompositorProxy, CompositorReceiver}; use compositor_thread::{InitialCompositorState, Msg, RenderListener}; +use core::nonzero::NonZero; use euclid::{Point2D, TypedPoint2D, TypedVector2D, ScaleFactor}; use gfx_traits::Epoch; use gleam::gl; @@ -61,7 +62,7 @@ impl ConvertPipelineIdFromWebRender for webrender_api::PipelineId { fn from_webrender(&self) -> PipelineId { PipelineId { namespace_id: PipelineNamespaceId(self.0), - index: PipelineIndex(self.1), + index: PipelineIndex(NonZero::new(self.1).expect("Webrender pipeline zero?")), } } } diff --git a/components/compositing/lib.rs b/components/compositing/lib.rs index 38371599678..03188affb2f 100644 --- a/components/compositing/lib.rs +++ b/components/compositing/lib.rs @@ -4,7 +4,9 @@ #![deny(unsafe_code)] #![feature(box_syntax)] +#![feature(nonzero)] +extern crate core; extern crate euclid; extern crate gfx_traits; extern crate gleam; diff --git a/components/msg/Cargo.toml b/components/msg/Cargo.toml index 2cebc58c228..3cb93c28572 100644 --- a/components/msg/Cargo.toml +++ b/components/msg/Cargo.toml @@ -13,5 +13,5 @@ path = "lib.rs" bitflags = "0.7" heapsize = "0.4" heapsize_derive = "0.1" -serde = "1.0" +serde = { version = "1.0.14", features = [ "unstable" ] } webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]} diff --git a/components/msg/constellation_msg.rs b/components/msg/constellation_msg.rs index e5eaf995201..823db993b38 100644 --- a/components/msg/constellation_msg.rs +++ b/components/msg/constellation_msg.rs @@ -5,6 +5,7 @@ //! The high-level interface from script to constellation. Using this abstract interface helps //! reduce coupling between these two components. +use core::nonzero::NonZero; use std::cell::Cell; use std::fmt; use webrender_api; @@ -194,10 +195,9 @@ impl PipelineNamespace { }); } - fn next_index(&mut self) -> u32 { - let result = self.index; - self.index = result + 1; - result + fn next_index(&mut self) -> NonZero { + self.index += 1; + NonZero::new(self.index).expect("pipeline id index wrapped!") } fn next_pipeline_id(&mut self) -> PipelineId { @@ -220,8 +220,9 @@ thread_local!(pub static PIPELINE_NAMESPACE: Cell> = C #[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, HeapSizeOf, Ord, PartialEq, PartialOrd, Serialize)] pub struct PipelineNamespaceId(pub u32); -#[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, HeapSizeOf, Ord, PartialEq, PartialOrd, Serialize)] -pub struct PipelineIndex(pub u32); +#[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, Ord, PartialEq, PartialOrd, Serialize)] +pub struct PipelineIndex(pub NonZero); +known_heap_size!(0, PipelineIndex); #[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, HeapSizeOf, Ord, PartialEq, PartialOrd, Serialize)] pub struct PipelineId { @@ -242,7 +243,7 @@ impl PipelineId { pub fn to_webrender(&self) -> webrender_api::PipelineId { let PipelineNamespaceId(namespace_id) = self.namespace_id; let PipelineIndex(index) = self.index; - webrender_api::PipelineId(namespace_id, index) + webrender_api::PipelineId(namespace_id, index.get()) } pub fn root_scroll_node(&self) -> webrender_api::ClipId { @@ -258,17 +259,18 @@ impl fmt::Display for PipelineId { fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { let PipelineNamespaceId(namespace_id) = self.namespace_id; let PipelineIndex(index) = self.index; - write!(fmt, "({},{})", namespace_id, index) + write!(fmt, "({},{})", namespace_id, index.get()) } } -#[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, HeapSizeOf, Ord, PartialEq, PartialOrd, Serialize)] -pub struct BrowsingContextIndex(pub u32); +#[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, Ord, PartialEq, PartialOrd, Serialize)] +pub struct BrowsingContextIndex(pub NonZero); +known_heap_size!(0, BrowsingContextIndex); #[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, HeapSizeOf, Ord, PartialEq, PartialOrd, Serialize)] pub struct BrowsingContextId { pub namespace_id: PipelineNamespaceId, - pub index: BrowsingContextIndex + pub index: BrowsingContextIndex, } impl BrowsingContextId { @@ -286,7 +288,7 @@ impl fmt::Display for BrowsingContextId { fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { let PipelineNamespaceId(namespace_id) = self.namespace_id; let BrowsingContextIndex(index) = self.index; - write!(fmt, "({},{})", namespace_id, index) + write!(fmt, "({},{})", namespace_id, index.get()) } } @@ -336,9 +338,12 @@ impl PartialEq for TopLevelBrowsingContextId { // We provide ids just for unit testing. pub const TEST_NAMESPACE: PipelineNamespaceId = PipelineNamespaceId(1234); -pub const TEST_PIPELINE_INDEX: PipelineIndex = PipelineIndex(5678); +#[allow(unsafe_code)] +pub const TEST_PIPELINE_INDEX: PipelineIndex = unsafe { PipelineIndex(NonZero::new_unchecked(5678)) }; pub const TEST_PIPELINE_ID: PipelineId = PipelineId { namespace_id: TEST_NAMESPACE, index: TEST_PIPELINE_INDEX }; -pub const TEST_BROWSING_CONTEXT_INDEX: BrowsingContextIndex = BrowsingContextIndex(8765); +#[allow(unsafe_code)] +pub const TEST_BROWSING_CONTEXT_INDEX: BrowsingContextIndex = + unsafe { BrowsingContextIndex(NonZero::new_unchecked(8765)) }; pub const TEST_BROWSING_CONTEXT_ID: BrowsingContextId = BrowsingContextId { namespace_id: TEST_NAMESPACE, index: TEST_BROWSING_CONTEXT_INDEX }; diff --git a/components/msg/lib.rs b/components/msg/lib.rs index 03fd010d461..0876603c1a5 100644 --- a/components/msg/lib.rs +++ b/components/msg/lib.rs @@ -2,11 +2,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#![feature(const_fn)] +#![feature(const_nonzero_new)] +#![feature(nonzero)] #![deny(unsafe_code)] #[macro_use] extern crate bitflags; -extern crate heapsize; +extern crate core; +#[macro_use] extern crate heapsize; #[macro_use] extern crate heapsize_derive; #[macro_use] extern crate serde; extern crate webrender_api; diff --git a/ports/servo/Cargo.toml b/ports/servo/Cargo.toml index b0dd093876f..4f39b70216d 100644 --- a/ports/servo/Cargo.toml +++ b/ports/servo/Cargo.toml @@ -18,6 +18,7 @@ compiletest_helper = {path = "../../tests/compiletest/helper"} gfx_tests = {path = "../../tests/unit/gfx"} layout_tests = {path = "../../tests/unit/layout"} metrics_tests = {path = "../../tests/unit/metrics"} +msg_tests = {path = "../../tests/unit/msg"} net_tests = {path = "../../tests/unit/net"} net_traits_tests = {path = "../../tests/unit/net_traits"} plugin_compiletest = {path = "../../tests/compiletest/plugin"} diff --git a/tests/unit/metrics/paint_time.rs b/tests/unit/metrics/paint_time.rs index 8fea5a32bb9..033e618269a 100644 --- a/tests/unit/metrics/paint_time.rs +++ b/tests/unit/metrics/paint_time.rs @@ -8,7 +8,7 @@ use gfx::display_list::{DisplayItem, DisplayList, ImageDisplayItem}; use gfx_traits::Epoch; use ipc_channel::ipc; use metrics::{PaintTimeMetrics, ProfilerMetadataFactory}; -use msg::constellation_msg::{PipelineId, PipelineIndex, PipelineNamespaceId}; +use msg::constellation_msg::TEST_PIPELINE_ID; use net_traits::image::base::PixelFormat; use profile_traits::time::{ProfilerChan, TimerMetadata}; use style::computed_values::image_rendering; @@ -23,30 +23,22 @@ impl ProfilerMetadataFactory for DummyProfilerMetadataFactory { #[test] fn test_paint_metrics_construction() { - let pipeline_id = PipelineId { - namespace_id: PipelineNamespaceId(1), - index: PipelineIndex(1), - }; let (sender, _) = ipc::channel().unwrap(); let profiler_chan = ProfilerChan(sender); let (layout_sender, _) = ipc::channel().unwrap(); let (script_sender, _) = ipc::channel().unwrap(); - let paint_time_metrics = PaintTimeMetrics::new(pipeline_id, profiler_chan, layout_sender, script_sender); + let paint_time_metrics = PaintTimeMetrics::new(TEST_PIPELINE_ID, profiler_chan, layout_sender, script_sender); assert_eq!(paint_time_metrics.get_navigation_start(), None, "navigation start is None"); assert_eq!(paint_time_metrics.get_first_paint(), None, "first paint is None"); assert_eq!(paint_time_metrics.get_first_contentful_paint(), None, "first contentful paint is None"); } fn test_common(display_list: &DisplayList, epoch: Epoch) -> PaintTimeMetrics { - let pipeline_id = PipelineId { - namespace_id: PipelineNamespaceId(1), - index: PipelineIndex(1), - }; let (sender, _) = ipc::channel().unwrap(); let profiler_chan = ProfilerChan(sender); let (layout_sender, _) = ipc::channel().unwrap(); let (script_sender, _) = ipc::channel().unwrap(); - let mut paint_time_metrics = PaintTimeMetrics::new(pipeline_id, profiler_chan, layout_sender, script_sender); + let mut paint_time_metrics = PaintTimeMetrics::new(TEST_PIPELINE_ID, profiler_chan, layout_sender, script_sender); let dummy_profiler_metadata_factory = DummyProfilerMetadataFactory {}; paint_time_metrics.maybe_observe_paint_time(&dummy_profiler_metadata_factory, @@ -81,12 +73,8 @@ fn test_first_paint_setter() { #[test] fn test_first_contentful_paint_setter() { - let pipeline_id = PipelineId { - namespace_id: PipelineNamespaceId(1), - index: PipelineIndex(1), - }; let image = DisplayItem::Image(Box::new(ImageDisplayItem { - base: BaseDisplayItem::empty(pipeline_id), + base: BaseDisplayItem::empty(TEST_PIPELINE_ID), webrender_image: WebRenderImageInfo { width: 1, height: 1, diff --git a/tests/unit/msg/Cargo.toml b/tests/unit/msg/Cargo.toml new file mode 100644 index 00000000000..89ee91d22c0 --- /dev/null +++ b/tests/unit/msg/Cargo.toml @@ -0,0 +1,14 @@ +[package] +name = "msg_tests" +version = "0.0.1" +authors = ["The Servo Project Developers"] +license = "MPL-2.0" + +[lib] +name = "msg_tests" +path = "lib.rs" +doctest = false + +[dependencies] +msg = {path = "../../../components/msg"} +size_of_test = {path = "../../../components/size_of_test"} diff --git a/tests/unit/msg/lib.rs b/tests/unit/msg/lib.rs new file mode 100644 index 00000000000..c1bc9a119d9 --- /dev/null +++ b/tests/unit/msg/lib.rs @@ -0,0 +1,8 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +extern crate msg; +#[macro_use] extern crate size_of_test; + +#[cfg(all(test, target_pointer_width = "64"))] mod size_of; diff --git a/tests/unit/msg/size_of.rs b/tests/unit/msg/size_of.rs new file mode 100644 index 00000000000..124238f9457 --- /dev/null +++ b/tests/unit/msg/size_of.rs @@ -0,0 +1,14 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +use msg::constellation_msg::BrowsingContextId; +use msg::constellation_msg::PipelineId; +use msg::constellation_msg::TopLevelBrowsingContextId; + +size_of_test!(test_size_of_pipeline_id, PipelineId, 8); +size_of_test!(test_size_of_optional_pipeline_id, Option, 8); +size_of_test!(test_size_of_browsing_context_id, BrowsingContextId, 8); +size_of_test!(test_size_of_optional_browsing_context_id, Option, 8); +size_of_test!(test_size_of_top_level_browsing_context_id, TopLevelBrowsingContextId, 8); +size_of_test!(test_size_of_top_level_optional_browsing_context_id, Option, 8);