From 219d1b92010612e0cd81261417abff5beb3ece06 Mon Sep 17 00:00:00 2001 From: Alan Jeffrey Date: Mon, 26 Oct 2015 14:45:21 -0500 Subject: [PATCH] Updated to v0.1.15 of string_cache. Manually edited ports/gonk/Cargo.lock. Trying to rebuild ports/gonk/Cargo.lock using cargo-update produes errors: $ ./mach update-cargo -p string_cache_shared -p string_cache_plugin -p string_cache components/servo Updating registry `https://github.com/rust-lang/crates.io-index` Adding bitflags v0.1.1 Adding gl_generator v0.0.27 Adding khronos_api v0.0.7 ports/cef Updating registry `https://github.com/rust-lang/crates.io-index` Adding bitflags v0.3.2 Adding gl_generator v0.0.27 Adding khronos_api v0.0.8 ports/gonk Updating registry `https://github.com/rust-lang/crates.io-index` Package `serde v0.5.2` does not have these features: `unstable` --- components/script/Cargo.toml | 2 +- components/servo/Cargo.lock | 40 ++++++++++++++++++------------------ ports/cef/Cargo.lock | 36 ++++++++++++++++---------------- ports/gonk/Cargo.lock | 36 ++++++++++++++++---------------- 4 files changed, 57 insertions(+), 57 deletions(-) diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index 5c62fb3ee28..0f8913f8c00 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -85,7 +85,7 @@ websocket = "0.12.0" uuid = "0.1.16" smallvec = "0.1" html5ever = { version = "0.2.1", features = ["unstable"] } -string_cache = { version = "0.1.9", features = ["unstable"] } +string_cache = { version = "0.1.15", features = ["unstable"] } string_cache_plugin = "0.1" euclid = "0.2" tendril = "0.1.1" diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 1f30b1820e9..0a67dc614c1 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -651,7 +651,7 @@ dependencies = [ "simd 0.1.0 (git+https://github.com/huonw/simd)", "skia 0.0.20130412 (git+https://github.com/servo/skia)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -849,8 +849,8 @@ dependencies = [ "phf_codegen 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)", "rc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1012,8 +1012,8 @@ dependencies = [ "serde_json 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "unicode-bidi 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1518,8 +1518,8 @@ dependencies = [ "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "tendril 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1569,8 +1569,8 @@ dependencies = [ "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "quickersort 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1673,28 +1673,28 @@ dependencies = [ [[package]] name = "string_cache" -version = "0.1.13" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_shared 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_shared 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "string_cache_plugin" -version = "0.1.7" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_shared 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_shared 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "string_cache_shared" -version = "0.1.7" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "debug_unreachable 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1722,8 +1722,8 @@ dependencies = [ "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", @@ -1737,8 +1737,8 @@ dependencies = [ "cssparser 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", - "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "style_traits 0.0.1", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1905,7 +1905,7 @@ dependencies = [ "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index 7f69e2a8524..65aafad158e 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -608,7 +608,7 @@ dependencies = [ "simd 0.1.0 (git+https://github.com/huonw/simd)", "skia 0.0.20130412 (git+https://github.com/servo/skia)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -799,8 +799,8 @@ dependencies = [ "phf_codegen 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)", "rc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -962,8 +962,8 @@ dependencies = [ "serde_json 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "unicode-bidi 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1450,8 +1450,8 @@ dependencies = [ "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "tendril 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1493,8 +1493,8 @@ dependencies = [ "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "quickersort 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1629,28 +1629,28 @@ dependencies = [ [[package]] name = "string_cache" -version = "0.1.13" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_shared 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_shared 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "string_cache_plugin" -version = "0.1.7" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_shared 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_shared 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "string_cache_shared" -version = "0.1.7" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "debug_unreachable 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1678,8 +1678,8 @@ dependencies = [ "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", @@ -1845,7 +1845,7 @@ dependencies = [ "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index 6ddf87fee77..0b872ec8ec8 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -556,7 +556,7 @@ dependencies = [ "simd 0.1.0 (git+https://github.com/huonw/simd)", "skia 0.0.20130412 (git+https://github.com/servo/skia)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -694,8 +694,8 @@ dependencies = [ "phf_codegen 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)", "rc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "tendril 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -857,8 +857,8 @@ dependencies = [ "serde_json 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "unicode-bidi 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-script 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1327,8 +1327,8 @@ dependencies = [ "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "style 0.0.1", "tendril 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1370,8 +1370,8 @@ dependencies = [ "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "quickersort 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1486,28 +1486,28 @@ dependencies = [ [[package]] name = "string_cache" -version = "0.1.13" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_shared 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_shared 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "string_cache_plugin" -version = "0.1.7" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_shared 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_shared 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "string_cache_shared" -version = "0.1.7" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "debug_unreachable 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1535,8 +1535,8 @@ dependencies = [ "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache_plugin 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "style_traits 0.0.1", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", @@ -1691,7 +1691,7 @@ dependencies = [ "serde 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_macros 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", + "string_cache 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)", ]