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 39a7a8460ce..6d08b21bcec 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -57,12 +57,6 @@ 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"] @@ -86,3 +80,5 @@ 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 159a22fe56e..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)", @@ -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", @@ -1053,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)", @@ -1088,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)", @@ -1096,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]] @@ -1131,19 +1131,6 @@ dependencies = [ "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "string_cache" -version = "0.1.0" -source = "git+https://github.com/servo/string-cache#0bf77b58a3a69cb4029872f5fb2d8b1bbc3860cf" -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)", -] - [[package]] name = "string_cache" version = "0.1.3" @@ -1157,16 +1144,6 @@ dependencies = [ "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" -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)", -] - [[package]] name = "string_cache_plugin" version = "0.1.2" @@ -1177,11 +1154,6 @@ dependencies = [ "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" @@ -1204,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", ] @@ -1217,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", @@ -1306,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 ae1c6295d7a..af051f09583 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -1080,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)", @@ -1088,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]] diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index 0e5611e8944..0177a67c77c 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -979,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)", @@ -987,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]] 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"