From 0d226722b70244a1db8ad25b93b0052b2722c6da Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Wed, 6 May 2015 19:19:36 +0200 Subject: [PATCH] Deduplicate some dependencies. This uses some dependencies from crates.io instead of git where the crates.io copy was already used in some other part of the dependency tree, so we had two copies of the same library. The `android_glue` crate is the only one left where we have two copies, but solving that is more tricky since we hard-code a path in `components/servo/.cargo/config`. --- components/net/Cargo.toml | 2 +- components/script/Cargo.toml | 4 +- components/servo/Cargo.lock | 97 +++++++++++++++++------------------- components/style/Cargo.toml | 4 +- components/util/Cargo.toml | 4 +- ports/cef/Cargo.lock | 93 ++++++++++++++++------------------ ports/gonk/Cargo.lock | 93 ++++++++++++++++------------------ 7 files changed, 135 insertions(+), 162 deletions(-) diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml index 3fb0f5b0a7b..6869fb274e6 100644 --- a/components/net/Cargo.toml +++ b/components/net/Cargo.toml @@ -32,4 +32,4 @@ regex = "0.1.14" regex_macros = "0.1.8" hyper = "0.3" flate2 = "0.2.0" -uuid = "*" +uuid = "0.1.16" diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index 73043ccb366..ac3c05fbb6d 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -60,9 +60,6 @@ git = "https://github.com/servo/rust-mozjs" [dependencies.png] git = "https://github.com/servo/rust-png" -[dependencies.uuid] -git = "https://github.com/rust-lang/uuid" - [dependencies.string_cache] git = "https://github.com/servo/string-cache" @@ -81,3 +78,4 @@ cssparser = "0.3.1" unicase = "0.1" num = "0.1.24" websocket = "0.11.0" +uuid = "0.1.16" diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 771d149dc58..76f9fac61e1 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -326,11 +326,6 @@ name = "freetype-sys" version = "2.4.11" source = "git+https://github.com/servo/libfreetype2#50c1cf412d87f20ccbb940e39a14a38ae7cbb512" -[[package]] -name = "gcc" -version = "0.3.4" -source = "git+https://github.com/alexcrichton/gcc-rs#9596a4e6da55e5ddbad6fd645b9727aae6b545ef" - [[package]] name = "gcc" version = "0.3.4" @@ -379,7 +374,7 @@ dependencies = [ "script_traits 0.0.1", "skia 0.0.20130412 (git+https://github.com/servo/skia)", "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)", - "string_cache 0.0.0 (git+https://github.com/servo/string-cache)", + "string_cache 0.1.0 (git+https://github.com/servo/string-cache)", "style 0.0.1", "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)", @@ -532,8 +527,8 @@ dependencies = [ "mac 0.0.2 (git+https://github.com/reem/rust-mac)", "phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.0.0 (git+https://github.com/servo/string-cache)", - "string_cache_plugin 0.0.0 (git+https://github.com/servo/string-cache)", + "string_cache 0.1.0 (git+https://github.com/servo/string-cache)", + "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)", "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -649,8 +644,8 @@ dependencies = [ "script 0.0.1", "script_traits 0.0.1", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", - "string_cache 0.0.0 (git+https://github.com/servo/string-cache)", - "string_cache_plugin 0.0.0 (git+https://github.com/servo/string-cache)", + "string_cache 0.1.0 (git+https://github.com/servo/string-cache)", + "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)", "style 0.0.1", "url 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", @@ -669,11 +664,6 @@ dependencies = [ "util 0.0.1", ] -[[package]] -name = "lazy_static" -version = "0.1.10" -source = "git+https://github.com/Kimundi/lazy-static.rs#1366fce0e706ee8530c88b80039946c4c7e1f993" - [[package]] name = "lazy_static" version = "0.1.10" @@ -705,6 +695,11 @@ name = "mac" version = "0.0.2" source = "git+https://github.com/reem/rust-mac#6316d3f4663756180fd236b126a84e245e978765" +[[package]] +name = "mac" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "malloc_buf" version = "0.0.5" @@ -780,7 +775,7 @@ dependencies = [ "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "uuid 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -934,9 +929,9 @@ dependencies = [ [[package]] name = "png" version = "0.1.0" -source = "git+https://github.com/servo/rust-png#811e4d339441dd34fb087fc895e1619ba882933f" +source = "git+https://github.com/servo/rust-png#80e765ed1880ea70a8326a13964f57657b9e6fa9" dependencies = [ - "gcc 0.3.4 (git+https://github.com/alexcrichton/gcc-rs)", + "gcc 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "png-sys 1.6.16 (git+https://github.com/servo/rust-png)", ] @@ -944,7 +939,7 @@ dependencies = [ [[package]] name = "png-sys" version = "1.6.16" -source = "git+https://github.com/servo/rust-png#811e4d339441dd34fb087fc895e1619ba882933f" +source = "git+https://github.com/servo/rust-png#80e765ed1880ea70a8326a13964f57657b9e6fa9" [[package]] name = "profile" @@ -1021,14 +1016,14 @@ dependencies = [ "rustc-serialize 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", "script_traits 0.0.1", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", - "string_cache 0.0.0 (git+https://github.com/servo/string-cache)", - "string_cache_plugin 0.0.0 (git+https://github.com/servo/string-cache)", + "string_cache 0.1.0 (git+https://github.com/servo/string-cache)", + "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)", "style 0.0.1", "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "uuid 0.1.16 (git+https://github.com/rust-lang/uuid)", + "uuid 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "webdriver_traits 0.0.1", "websocket 0.11.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1065,8 +1060,8 @@ dependencies = [ "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "quicksort 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.0.0 (git+https://github.com/servo/string-cache)", - "string_cache_plugin 0.0.0 (git+https://github.com/servo/string-cache)", + "string_cache 0.1.0 (git+https://github.com/servo/string-cache)", + "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)", ] [[package]] @@ -1093,25 +1088,32 @@ dependencies = [ [[package]] name = "string_cache" -version = "0.0.0" -source = "git+https://github.com/servo/string-cache#385c4ac197742e355631209be3613c8a9c7594b6" +version = "0.1.0" +source = "git+https://github.com/servo/string-cache#c5912f925e9c1db7dbe4a7980fbc3eed08eef51d" dependencies = [ - "lazy_static 0.1.10 (git+https://github.com/Kimundi/lazy-static.rs)", + "lazy_static 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.0.0 (git+https://github.com/servo/string-cache)", + "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)", + "string_cache_shared 0.1.0 (git+https://github.com/servo/string-cache)", ] [[package]] name = "string_cache_plugin" -version = "0.0.0" -source = "git+https://github.com/servo/string-cache#385c4ac197742e355631209be3613c8a9c7594b6" +version = "0.1.1" +source = "git+https://github.com/servo/string-cache#c5912f925e9c1db7dbe4a7980fbc3eed08eef51d" dependencies = [ - "lazy_static 0.1.10 (git+https://github.com/Kimundi/lazy-static.rs)", - "mac 0.0.2 (git+https://github.com/reem/rust-mac)", + "lazy_static 0.1.10 (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.0 (git+https://github.com/servo/string-cache)", ] +[[package]] +name = "string_cache_shared" +version = "0.1.0" +source = "git+https://github.com/servo/string-cache#c5912f925e9c1db7dbe4a7980fbc3eed08eef51d" + [[package]] name = "style" version = "0.0.1" @@ -1120,15 +1122,15 @@ dependencies = [ "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)", - "lazy_static 0.1.10 (git+https://github.com/Kimundi/lazy-static.rs)", + "lazy_static 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "mod_path 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "rustc-serialize 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", - "string_cache 0.0.0 (git+https://github.com/servo/string-cache)", - "string_cache_plugin 0.0.0 (git+https://github.com/servo/string-cache)", + "string_cache 0.1.0 (git+https://github.com/servo/string-cache)", + "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)", "url 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -1140,8 +1142,8 @@ dependencies = [ "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", - "string_cache 0.0.0 (git+https://github.com/servo/string-cache)", - "string_cache_plugin 0.0.0 (git+https://github.com/servo/string-cache)", + "string_cache 0.1.0 (git+https://github.com/servo/string-cache)", + "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)", "style 0.0.1", "url 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", @@ -1215,7 +1217,7 @@ dependencies = [ "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", - "lazy_static 0.1.10 (git+https://github.com/Kimundi/lazy-static.rs)", + "lazy_static 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1224,8 +1226,8 @@ dependencies = [ "rustc-serialize 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", "smallvec 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.0.0 (git+https://github.com/servo/string-cache)", - "string_cache_plugin 0.0.0 (git+https://github.com/servo/string-cache)", + "string_cache 0.1.0 (git+https://github.com/servo/string-cache)", + "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)", "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1239,16 +1241,7 @@ dependencies = [ [[package]] name = "uuid" -version = "0.1.16" -source = "git+https://github.com/rust-lang/uuid#7c767220c41746d346c8195e31ddf090ac6568e7" -dependencies = [ - "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "uuid" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1264,7 +1257,7 @@ dependencies = [ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.1.30 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", - "uuid 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1275,7 +1268,7 @@ dependencies = [ "rustc-serialize 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "uuid 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "webdriver 0.1.0 (git+https://github.com/jgraham/webdriver-rust.git)", "webdriver_traits 0.0.1", ] diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml index 0022d09714c..d29f89d4863 100644 --- a/components/style/Cargo.toml +++ b/components/style/Cargo.toml @@ -21,9 +21,6 @@ git = "https://github.com/servo/rust-geom" [dependencies.selectors] git = "https://github.com/servo/rust-selectors" -[dependencies.lazy_static] -git = "https://github.com/Kimundi/lazy-static.rs" - [dependencies.string_cache] git = "https://github.com/servo/string-cache" @@ -39,3 +36,4 @@ mod_path = "0.1" bitflags = "*" cssparser = "0.3.1" num = "0.1.24" +lazy_static = "0.1.10" diff --git a/components/util/Cargo.toml b/components/util/Cargo.toml index d802cb92061..dadc3872d8e 100644 --- a/components/util/Cargo.toml +++ b/components/util/Cargo.toml @@ -36,9 +36,6 @@ git = "https://github.com/servo/string-cache" [dependencies.string_cache_plugin] git = "https://github.com/servo/string-cache" -[dependencies.lazy_static] -git = "https://github.com/Kimundi/lazy-static.rs" - [dependencies] bitflags = "*" libc = "*" @@ -50,3 +47,4 @@ num_cpus = "0.2.2" fnv = "1.0" cssparser = "0.3.1" num = "0.1.24" +lazy_static = "0.1.10" diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index bbd087757a2..fbf0d94a5d4 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -334,11 +334,6 @@ name = "freetype-sys" version = "2.4.11" source = "git+https://github.com/servo/libfreetype2#50c1cf412d87f20ccbb940e39a14a38ae7cbb512" -[[package]] -name = "gcc" -version = "0.3.4" -source = "git+https://github.com/alexcrichton/gcc-rs#9596a4e6da55e5ddbad6fd645b9727aae6b545ef" - [[package]] name = "gcc" version = "0.3.4" @@ -387,7 +382,7 @@ dependencies = [ "script_traits 0.0.1", "skia 0.0.20130412 (git+https://github.com/servo/skia)", "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)", - "string_cache 0.0.0 (git+https://github.com/servo/string-cache)", + "string_cache 0.1.0 (git+https://github.com/servo/string-cache)", "style 0.0.1", "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)", @@ -533,8 +528,8 @@ dependencies = [ "mac 0.0.2 (git+https://github.com/reem/rust-mac)", "phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.0.0 (git+https://github.com/servo/string-cache)", - "string_cache_plugin 0.0.0 (git+https://github.com/servo/string-cache)", + "string_cache 0.1.0 (git+https://github.com/servo/string-cache)", + "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)", "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -650,8 +645,8 @@ dependencies = [ "script 0.0.1", "script_traits 0.0.1", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", - "string_cache 0.0.0 (git+https://github.com/servo/string-cache)", - "string_cache_plugin 0.0.0 (git+https://github.com/servo/string-cache)", + "string_cache 0.1.0 (git+https://github.com/servo/string-cache)", + "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)", "style 0.0.1", "url 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", @@ -670,11 +665,6 @@ dependencies = [ "util 0.0.1", ] -[[package]] -name = "lazy_static" -version = "0.1.10" -source = "git+https://github.com/Kimundi/lazy-static.rs#1366fce0e706ee8530c88b80039946c4c7e1f993" - [[package]] name = "lazy_static" version = "0.1.10" @@ -706,6 +696,11 @@ name = "mac" version = "0.0.2" source = "git+https://github.com/reem/rust-mac#6316d3f4663756180fd236b126a84e245e978765" +[[package]] +name = "mac" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "malloc_buf" version = "0.0.5" @@ -781,7 +776,7 @@ dependencies = [ "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "uuid 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -923,9 +918,9 @@ dependencies = [ [[package]] name = "png" version = "0.1.0" -source = "git+https://github.com/servo/rust-png#811e4d339441dd34fb087fc895e1619ba882933f" +source = "git+https://github.com/servo/rust-png#80e765ed1880ea70a8326a13964f57657b9e6fa9" dependencies = [ - "gcc 0.3.4 (git+https://github.com/alexcrichton/gcc-rs)", + "gcc 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "png-sys 1.6.16 (git+https://github.com/servo/rust-png)", ] @@ -933,7 +928,7 @@ dependencies = [ [[package]] name = "png-sys" version = "1.6.16" -source = "git+https://github.com/servo/rust-png#811e4d339441dd34fb087fc895e1619ba882933f" +source = "git+https://github.com/servo/rust-png#80e765ed1880ea70a8326a13964f57657b9e6fa9" [[package]] name = "profile" @@ -1010,14 +1005,14 @@ dependencies = [ "rustc-serialize 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", "script_traits 0.0.1", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", - "string_cache 0.0.0 (git+https://github.com/servo/string-cache)", - "string_cache_plugin 0.0.0 (git+https://github.com/servo/string-cache)", + "string_cache 0.1.0 (git+https://github.com/servo/string-cache)", + "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)", "style 0.0.1", "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "uuid 0.1.16 (git+https://github.com/rust-lang/uuid)", + "uuid 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "webdriver_traits 0.0.1", "websocket 0.11.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1046,8 +1041,8 @@ dependencies = [ "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "quicksort 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.0.0 (git+https://github.com/servo/string-cache)", - "string_cache_plugin 0.0.0 (git+https://github.com/servo/string-cache)", + "string_cache 0.1.0 (git+https://github.com/servo/string-cache)", + "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)", ] [[package]] @@ -1099,25 +1094,32 @@ dependencies = [ [[package]] name = "string_cache" -version = "0.0.0" -source = "git+https://github.com/servo/string-cache#385c4ac197742e355631209be3613c8a9c7594b6" +version = "0.1.0" +source = "git+https://github.com/servo/string-cache#c5912f925e9c1db7dbe4a7980fbc3eed08eef51d" dependencies = [ - "lazy_static 0.1.10 (git+https://github.com/Kimundi/lazy-static.rs)", + "lazy_static 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.0.0 (git+https://github.com/servo/string-cache)", + "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)", + "string_cache_shared 0.1.0 (git+https://github.com/servo/string-cache)", ] [[package]] name = "string_cache_plugin" -version = "0.0.0" -source = "git+https://github.com/servo/string-cache#385c4ac197742e355631209be3613c8a9c7594b6" +version = "0.1.1" +source = "git+https://github.com/servo/string-cache#c5912f925e9c1db7dbe4a7980fbc3eed08eef51d" dependencies = [ - "lazy_static 0.1.10 (git+https://github.com/Kimundi/lazy-static.rs)", - "mac 0.0.2 (git+https://github.com/reem/rust-mac)", + "lazy_static 0.1.10 (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.0 (git+https://github.com/servo/string-cache)", ] +[[package]] +name = "string_cache_shared" +version = "0.1.0" +source = "git+https://github.com/servo/string-cache#c5912f925e9c1db7dbe4a7980fbc3eed08eef51d" + [[package]] name = "style" version = "0.0.1" @@ -1126,15 +1128,15 @@ dependencies = [ "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)", - "lazy_static 0.1.10 (git+https://github.com/Kimundi/lazy-static.rs)", + "lazy_static 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "mod_path 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "rustc-serialize 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", - "string_cache 0.0.0 (git+https://github.com/servo/string-cache)", - "string_cache_plugin 0.0.0 (git+https://github.com/servo/string-cache)", + "string_cache 0.1.0 (git+https://github.com/servo/string-cache)", + "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)", "url 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -1207,7 +1209,7 @@ dependencies = [ "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", - "lazy_static 0.1.10 (git+https://github.com/Kimundi/lazy-static.rs)", + "lazy_static 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1216,23 +1218,14 @@ dependencies = [ "rustc-serialize 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", "smallvec 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.0.0 (git+https://github.com/servo/string-cache)", - "string_cache_plugin 0.0.0 (git+https://github.com/servo/string-cache)", + "string_cache 0.1.0 (git+https://github.com/servo/string-cache)", + "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)", "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "uuid" -version = "0.1.16" -source = "git+https://github.com/rust-lang/uuid#7c767220c41746d346c8195e31ddf090ac6568e7" -dependencies = [ - "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "uuid" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1248,7 +1241,7 @@ dependencies = [ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.1.30 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", - "uuid 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1259,7 +1252,7 @@ dependencies = [ "rustc-serialize 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "uuid 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "webdriver 0.1.0 (git+https://github.com/jgraham/webdriver-rust.git)", "webdriver_traits 0.0.1", ] diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index ad15c9a1005..c51bb6e7397 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -327,11 +327,6 @@ name = "freetype-sys" version = "2.4.11" source = "git+https://github.com/servo/libfreetype2#50c1cf412d87f20ccbb940e39a14a38ae7cbb512" -[[package]] -name = "gcc" -version = "0.3.4" -source = "git+https://github.com/alexcrichton/gcc-rs#9596a4e6da55e5ddbad6fd645b9727aae6b545ef" - [[package]] name = "gcc" version = "0.3.4" @@ -380,7 +375,7 @@ dependencies = [ "script_traits 0.0.1", "skia 0.0.20130412 (git+https://github.com/servo/skia)", "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)", - "string_cache 0.0.0 (git+https://github.com/servo/string-cache)", + "string_cache 0.1.0 (git+https://github.com/servo/string-cache)", "style 0.0.1", "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)", @@ -506,8 +501,8 @@ dependencies = [ "mac 0.0.2 (git+https://github.com/reem/rust-mac)", "phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.0.0 (git+https://github.com/servo/string-cache)", - "string_cache_plugin 0.0.0 (git+https://github.com/servo/string-cache)", + "string_cache 0.1.0 (git+https://github.com/servo/string-cache)", + "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)", "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -623,8 +618,8 @@ dependencies = [ "script 0.0.1", "script_traits 0.0.1", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", - "string_cache 0.0.0 (git+https://github.com/servo/string-cache)", - "string_cache_plugin 0.0.0 (git+https://github.com/servo/string-cache)", + "string_cache 0.1.0 (git+https://github.com/servo/string-cache)", + "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)", "style 0.0.1", "url 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", @@ -643,11 +638,6 @@ dependencies = [ "util 0.0.1", ] -[[package]] -name = "lazy_static" -version = "0.1.10" -source = "git+https://github.com/Kimundi/lazy-static.rs#1366fce0e706ee8530c88b80039946c4c7e1f993" - [[package]] name = "lazy_static" version = "0.1.10" @@ -679,6 +669,11 @@ name = "mac" version = "0.0.2" source = "git+https://github.com/reem/rust-mac#6316d3f4663756180fd236b126a84e245e978765" +[[package]] +name = "mac" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "malloc_buf" version = "0.0.5" @@ -754,7 +749,7 @@ dependencies = [ "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "uuid 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -896,9 +891,9 @@ dependencies = [ [[package]] name = "png" version = "0.1.0" -source = "git+https://github.com/servo/rust-png#811e4d339441dd34fb087fc895e1619ba882933f" +source = "git+https://github.com/servo/rust-png#80e765ed1880ea70a8326a13964f57657b9e6fa9" dependencies = [ - "gcc 0.3.4 (git+https://github.com/alexcrichton/gcc-rs)", + "gcc 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "png-sys 1.6.16 (git+https://github.com/servo/rust-png)", ] @@ -906,7 +901,7 @@ dependencies = [ [[package]] name = "png-sys" version = "1.6.16" -source = "git+https://github.com/servo/rust-png#811e4d339441dd34fb087fc895e1619ba882933f" +source = "git+https://github.com/servo/rust-png#80e765ed1880ea70a8326a13964f57657b9e6fa9" [[package]] name = "profile" @@ -983,14 +978,14 @@ dependencies = [ "rustc-serialize 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", "script_traits 0.0.1", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", - "string_cache 0.0.0 (git+https://github.com/servo/string-cache)", - "string_cache_plugin 0.0.0 (git+https://github.com/servo/string-cache)", + "string_cache 0.1.0 (git+https://github.com/servo/string-cache)", + "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)", "style 0.0.1", "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", "unicase 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "uuid 0.1.16 (git+https://github.com/rust-lang/uuid)", + "uuid 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "webdriver_traits 0.0.1", "websocket 0.11.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1019,8 +1014,8 @@ dependencies = [ "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "quicksort 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.0.0 (git+https://github.com/servo/string-cache)", - "string_cache_plugin 0.0.0 (git+https://github.com/servo/string-cache)", + "string_cache 0.1.0 (git+https://github.com/servo/string-cache)", + "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)", ] [[package]] @@ -1071,25 +1066,32 @@ dependencies = [ [[package]] name = "string_cache" -version = "0.0.0" -source = "git+https://github.com/servo/string-cache#385c4ac197742e355631209be3613c8a9c7594b6" +version = "0.1.0" +source = "git+https://github.com/servo/string-cache#c5912f925e9c1db7dbe4a7980fbc3eed08eef51d" dependencies = [ - "lazy_static 0.1.10 (git+https://github.com/Kimundi/lazy-static.rs)", + "lazy_static 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "phf 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "phf_macros 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache_plugin 0.0.0 (git+https://github.com/servo/string-cache)", + "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)", + "string_cache_shared 0.1.0 (git+https://github.com/servo/string-cache)", ] [[package]] name = "string_cache_plugin" -version = "0.0.0" -source = "git+https://github.com/servo/string-cache#385c4ac197742e355631209be3613c8a9c7594b6" +version = "0.1.1" +source = "git+https://github.com/servo/string-cache#c5912f925e9c1db7dbe4a7980fbc3eed08eef51d" dependencies = [ - "lazy_static 0.1.10 (git+https://github.com/Kimundi/lazy-static.rs)", - "mac 0.0.2 (git+https://github.com/reem/rust-mac)", + "lazy_static 0.1.10 (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.0 (git+https://github.com/servo/string-cache)", ] +[[package]] +name = "string_cache_shared" +version = "0.1.0" +source = "git+https://github.com/servo/string-cache#c5912f925e9c1db7dbe4a7980fbc3eed08eef51d" + [[package]] name = "style" version = "0.0.1" @@ -1098,15 +1100,15 @@ dependencies = [ "cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "encoding 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)", - "lazy_static 0.1.10 (git+https://github.com/Kimundi/lazy-static.rs)", + "lazy_static 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "mod_path 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "rustc-serialize 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", - "string_cache 0.0.0 (git+https://github.com/servo/string-cache)", - "string_cache_plugin 0.0.0 (git+https://github.com/servo/string-cache)", + "string_cache 0.1.0 (git+https://github.com/servo/string-cache)", + "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)", "url 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", ] @@ -1179,7 +1181,7 @@ dependencies = [ "fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", - "lazy_static 0.1.10 (git+https://github.com/Kimundi/lazy-static.rs)", + "lazy_static 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1188,23 +1190,14 @@ dependencies = [ "rustc-serialize 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", "smallvec 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "string_cache 0.0.0 (git+https://github.com/servo/string-cache)", - "string_cache_plugin 0.0.0 (git+https://github.com/servo/string-cache)", + "string_cache 0.1.0 (git+https://github.com/servo/string-cache)", + "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)", "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "uuid" -version = "0.1.16" -source = "git+https://github.com/rust-lang/uuid#7c767220c41746d346c8195e31ddf090ac6568e7" -dependencies = [ - "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "uuid" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1220,7 +1213,7 @@ dependencies = [ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.1.30 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", - "uuid 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1231,7 +1224,7 @@ dependencies = [ "rustc-serialize 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", "url 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)", "util 0.0.1", - "uuid 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", + "uuid 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "webdriver 0.1.0 (git+https://github.com/jgraham/webdriver-rust.git)", "webdriver_traits 0.0.1", ]