aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--components/gfx/Cargo.toml4
-rw-r--r--components/layout/Cargo.toml8
-rw-r--r--components/script/Cargo.toml12
-rw-r--r--components/servo/Cargo.lock71
-rw-r--r--components/style/Cargo.toml8
-rw-r--r--components/util/Cargo.toml8
-rw-r--r--ports/cef/Cargo.lock63
-rw-r--r--ports/gonk/Cargo.lock63
-rw-r--r--tests/unit/style/Cargo.toml8
9 files changed, 131 insertions, 114 deletions
diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml
index 2e307dcf6be..5b5bc001086 100644
--- a/components/gfx/Cargo.toml
+++ b/components/gfx/Cargo.toml
@@ -53,9 +53,6 @@ git = "https://github.com/servo/skia"
[dependencies.script_traits]
path = "../script_traits"
-[dependencies.string_cache]
-git = "https://github.com/servo/string-cache"
-
[dependencies]
log = "*"
fnv = "1.0"
@@ -67,6 +64,7 @@ libc = "*"
rand = "*"
harfbuzz = "0.1"
smallvec = "0.1"
+string_cache = "0.1"
[target.x86_64-apple-darwin.dependencies]
core-foundation = "*"
diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml
index f4a587a20d3..c4497f35c71 100644
--- a/components/layout/Cargo.toml
+++ b/components/layout/Cargo.toml
@@ -55,12 +55,6 @@ git = "https://github.com/servo/rust-selectors"
[dependencies.geom]
git = "https://github.com/servo/rust-geom"
-[dependencies.string_cache]
-git = "https://github.com/servo/string-cache"
-
-[dependencies.string_cache_plugin]
-git = "https://github.com/servo/string-cache"
-
[dependencies.png]
git = "https://github.com/servo/rust-png"
@@ -77,3 +71,5 @@ rustc-serialize = "0.3"
libc = "*"
cssparser = "0.3.1"
smallvec = "0.1"
+string_cache = "0.1"
+string_cache_plugin = "0.1"
diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
index a7bc559ba7a..6d08b21bcec 100644
--- a/components/script/Cargo.toml
+++ b/components/script/Cargo.toml
@@ -51,21 +51,12 @@ git = "https://github.com/servo/rust-selectors"
[dependencies.geom]
git = "https://github.com/servo/rust-geom"
-[dependencies.html5ever]
-git = "https://github.com/servo/html5ever"
-
[dependencies.js]
git = "https://github.com/servo/rust-mozjs"
[dependencies.png]
git = "https://github.com/servo/rust-png"
-[dependencies.string_cache]
-git = "https://github.com/servo/string-cache"
-
-[dependencies.string_cache_plugin]
-git = "https://github.com/servo/string-cache"
-
[dependencies.url]
version = "0.2.33"
features = ["query_encoding"]
@@ -88,3 +79,6 @@ num = "0.1.24"
websocket = "0.12"
uuid = "0.1.16"
smallvec = "0.1"
+html5ever = "0.1"
+string_cache = "0.1"
+string_cache_plugin = "0.1"
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index e4d75ff0d6f..7d97181ec65 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -423,7 +423,7 @@ dependencies = [
"skia 0.0.20130412 (git+https://github.com/servo/skia)",
"smallvec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)",
- "string_cache 0.1.0 (git+https://github.com/servo/string-cache)",
+ "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"style 0.0.1",
"time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -539,25 +539,25 @@ dependencies = [
[[package]]
name = "html5ever"
-version = "0.0.0"
-source = "git+https://github.com/servo/html5ever#ec7e7e94b1b46de9bf8d2512eb6b17f277897bc7"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "html5ever_macros 0.0.0 (git+https://github.com/servo/html5ever)",
+ "html5ever_macros 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "mac 0.0.2 (git+https://github.com/reem/rust-mac)",
+ "mac 0.0.2 (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)",
- "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)",
+ "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "html5ever_macros"
-version = "0.0.0"
-source = "git+https://github.com/servo/html5ever#ec7e7e94b1b46de9bf8d2512eb6b17f277897bc7"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "mac 0.0.2 (git+https://github.com/reem/rust-mac)",
+ "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -670,8 +670,8 @@ dependencies = [
"script_traits 0.0.1",
"selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
"smallvec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "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)",
+ "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"style 0.0.1",
"url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
@@ -720,11 +720,6 @@ dependencies = [
[[package]]
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]]
@@ -1042,7 +1037,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)",
"gfx 0.0.1",
- "html5ever 0.0.0 (git+https://github.com/servo/html5ever)",
+ "html5ever 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"js 0.1.0 (git+https://github.com/servo/rust-mozjs)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1058,8 +1053,8 @@ dependencies = [
"script_traits 0.0.1",
"selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
"smallvec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "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)",
+ "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"style 0.0.1",
"time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
"unicase 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1093,7 +1088,7 @@ dependencies = [
[[package]]
name = "selectors"
version = "0.1.0"
-source = "git+https://github.com/servo/rust-selectors#d24bca70ed23d182be101c031bdcf5ad5ac22657"
+source = "git+https://github.com/servo/rust-selectors#dc70cec19ba083a2d8d63db8d57430394bf6ad00"
dependencies = [
"bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1101,8 +1096,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.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "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)",
+ "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -1138,31 +1133,31 @@ dependencies = [
[[package]]
name = "string_cache"
-version = "0.1.0"
-source = "git+https://github.com/servo/string-cache#0bf77b58a3a69cb4029872f5fb2d8b1bbc3860cf"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"lazy_static 0.1.11 (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.1.1 (git+https://github.com/servo/string-cache)",
- "string_cache_shared 0.1.0 (git+https://github.com/servo/string-cache)",
+ "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_shared 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "string_cache_plugin"
-version = "0.1.1"
-source = "git+https://github.com/servo/string-cache#0bf77b58a3a69cb4029872f5fb2d8b1bbc3860cf"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"lazy_static 0.1.11 (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)",
+ "string_cache_shared 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "string_cache_shared"
-version = "0.1.0"
-source = "git+https://github.com/servo/string-cache#0bf77b58a3a69cb4029872f5fb2d8b1bbc3860cf"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "style"
@@ -1181,8 +1176,8 @@ dependencies = [
"rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
"selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
"smallvec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "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)",
+ "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
]
@@ -1194,8 +1189,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.1.0 (git+https://github.com/servo/string-cache)",
- "string_cache_plugin 0.1.1 (git+https://github.com/servo/string-cache)",
+ "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"style 0.0.1",
"url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
"util 0.0.1",
@@ -1283,8 +1278,8 @@ dependencies = [
"rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
"selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",
"smallvec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "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)",
+ "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
"url 0.2.35 (registry+https://github.com/rust-lang/crates.io-index)",
]
diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml
index 326e2523a0c..e837ef8adf5 100644
--- a/components/style/Cargo.toml
+++ b/components/style/Cargo.toml
@@ -21,12 +21,6 @@ git = "https://github.com/servo/rust-geom"
[dependencies.selectors]
git = "https://github.com/servo/rust-selectors"
-[dependencies.string_cache]
-git = "https://github.com/servo/string-cache"
-
-[dependencies.string_cache_plugin]
-git = "https://github.com/servo/string-cache"
-
[dependencies]
log = "*"
encoding = "0.2"
@@ -39,3 +33,5 @@ cssparser = "0.3.1"
num = "0.1.24"
lazy_static = "0.1.10"
smallvec = "0.1"
+string_cache = "0.1"
+string_cache_plugin = "0.1"
diff --git a/components/util/Cargo.toml b/components/util/Cargo.toml
index 5cb29749545..9fcf9be6d6e 100644
--- a/components/util/Cargo.toml
+++ b/components/util/Cargo.toml
@@ -30,12 +30,6 @@ git = "https://github.com/servo/rust-geom"
[dependencies.layers]
git = "https://github.com/servo/rust-layers"
-[dependencies.string_cache]
-git = "https://github.com/servo/string-cache"
-
-[dependencies.string_cache_plugin]
-git = "https://github.com/servo/string-cache"
-
[dependencies]
log = "*"
bitflags = "*"
@@ -49,3 +43,5 @@ cssparser = "0.3.1"
num = "0.1.24"
lazy_static = "0.1.10"
url = "*"
+string_cache = "0.1"
+string_cache_plugin = "0.1"
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
index ea9e54f406b..af051f09583 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -79,7 +79,7 @@ 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)",
"gfx_traits 0.0.1",
- "gleam 0.0.1 (git+https://github.com/servo/gleam)",
+ "gleam 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -156,7 +156,7 @@ dependencies = [
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"gfx 0.0.1",
"gfx_traits 0.0.1",
- "gleam 0.0.1 (git+https://github.com/servo/gleam)",
+ "gleam 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"layout_traits 0.0.1",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -551,25 +551,25 @@ dependencies = [
[[package]]
name = "html5ever"
-version = "0.0.0"
-source = "git+https://github.com/servo/html5ever#ec7e7e94b1b46de9bf8d2512eb6b17f277897bc7"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "html5ever_macros 0.0.0 (git+https://github.com/servo/html5ever)",
+ "html5ever_macros 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "mac 0.0.2 (git+https://github.com/reem/rust-mac)",
+ "mac 0.0.2 (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)",
- "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)",
+ "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "html5ever_macros"
-version = "0.0.0"
-source = "git+https://github.com/servo/html5ever#ec7e7e94b1b46de9bf8d2512eb6b17f277897bc7"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "mac 0.0.2 (git+https://github.com/reem/rust-mac)",
+ "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -732,11 +732,6 @@ dependencies = [
[[package]]
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]]
@@ -1042,7 +1037,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)",
"gfx 0.0.1",
- "html5ever 0.0.0 (git+https://github.com/servo/html5ever)",
+ "html5ever 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"js 0.1.0 (git+https://github.com/servo/rust-mozjs)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1085,7 +1080,7 @@ dependencies = [
[[package]]
name = "selectors"
version = "0.1.0"
-source = "git+https://github.com/servo/rust-selectors#d24bca70ed23d182be101c031bdcf5ad5ac22657"
+source = "git+https://github.com/servo/rust-selectors#dc70cec19ba083a2d8d63db8d57430394bf6ad00"
dependencies = [
"bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1093,8 +1088,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.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "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)",
+ "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -1168,6 +1163,19 @@ dependencies = [
]
[[package]]
+name = "string_cache"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "lazy_static 0.1.11 (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.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_shared 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
name = "string_cache_plugin"
version = "0.1.1"
source = "git+https://github.com/servo/string-cache#0bf77b58a3a69cb4029872f5fb2d8b1bbc3860cf"
@@ -1178,11 +1186,26 @@ dependencies = [
]
[[package]]
+name = "string_cache_plugin"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "lazy_static 0.1.11 (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.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
name = "string_cache_shared"
version = "0.1.0"
source = "git+https://github.com/servo/string-cache#0bf77b58a3a69cb4029872f5fb2d8b1bbc3860cf"
[[package]]
+name = "string_cache_shared"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
name = "style"
version = "0.0.1"
dependencies = [
diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock
index 6f37eee61b1..0177a67c77c 100644
--- a/ports/gonk/Cargo.lock
+++ b/ports/gonk/Cargo.lock
@@ -66,7 +66,7 @@ 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)",
"gfx_traits 0.0.1",
- "gleam 0.0.1 (git+https://github.com/servo/gleam)",
+ "gleam 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"num 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -124,7 +124,7 @@ dependencies = [
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"gfx 0.0.1",
"gfx_traits 0.0.1",
- "gleam 0.0.1 (git+https://github.com/servo/gleam)",
+ "gleam 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"layout_traits 0.0.1",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -476,25 +476,25 @@ dependencies = [
[[package]]
name = "html5ever"
-version = "0.0.0"
-source = "git+https://github.com/servo/html5ever#ec7e7e94b1b46de9bf8d2512eb6b17f277897bc7"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "html5ever_macros 0.0.0 (git+https://github.com/servo/html5ever)",
+ "html5ever_macros 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "mac 0.0.2 (git+https://github.com/reem/rust-mac)",
+ "mac 0.0.2 (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)",
- "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)",
+ "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "html5ever_macros"
-version = "0.0.0"
-source = "git+https://github.com/servo/html5ever#ec7e7e94b1b46de9bf8d2512eb6b17f277897bc7"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "mac 0.0.2 (git+https://github.com/reem/rust-mac)",
+ "mac 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -657,11 +657,6 @@ dependencies = [
[[package]]
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]]
@@ -941,7 +936,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)",
"gfx 0.0.1",
- "html5ever 0.0.0 (git+https://github.com/servo/html5ever)",
+ "html5ever 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"hyper 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"js 0.1.0 (git+https://github.com/servo/rust-mozjs)",
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -984,7 +979,7 @@ dependencies = [
[[package]]
name = "selectors"
version = "0.1.0"
-source = "git+https://github.com/servo/rust-selectors#d24bca70ed23d182be101c031bdcf5ad5ac22657"
+source = "git+https://github.com/servo/rust-selectors#dc70cec19ba083a2d8d63db8d57430394bf6ad00"
dependencies = [
"bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"cssparser 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -992,8 +987,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.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "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)",
+ "string_cache 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -1057,6 +1052,19 @@ dependencies = [
]
[[package]]
+name = "string_cache"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "lazy_static 0.1.11 (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.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_shared 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
name = "string_cache_plugin"
version = "0.1.1"
source = "git+https://github.com/servo/string-cache#0bf77b58a3a69cb4029872f5fb2d8b1bbc3860cf"
@@ -1067,11 +1075,26 @@ dependencies = [
]
[[package]]
+name = "string_cache_plugin"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "lazy_static 0.1.11 (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.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
name = "string_cache_shared"
version = "0.1.0"
source = "git+https://github.com/servo/string-cache#0bf77b58a3a69cb4029872f5fb2d8b1bbc3860cf"
[[package]]
+name = "string_cache_shared"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
name = "style"
version = "0.0.1"
dependencies = [
diff --git a/tests/unit/style/Cargo.toml b/tests/unit/style/Cargo.toml
index 8f36c8890b5..dc6078eb9e9 100644
--- a/tests/unit/style/Cargo.toml
+++ b/tests/unit/style/Cargo.toml
@@ -14,12 +14,6 @@ path = "../../../components/style"
[dependencies.util]
path = "../../../components/util"
-[dependencies.string_cache_plugin]
-git = "https://github.com/servo/string-cache"
-
-[dependencies.string_cache]
-git = "https://github.com/servo/string-cache"
-
[dependencies.geom]
git = "https://github.com/servo/rust-geom"
@@ -29,3 +23,5 @@ git = "https://github.com/servo/rust-selectors"
[dependencies]
url = "*"
cssparser = "0.3.1"
+string_cache = "0.1"
+string_cache_plugin = "0.1"