diff options
| author | Patrick Walton <pcwalton@mimiga.net> | 2014-09-17 08:24:32 -0700 |
|---|---|---|
| committer | Patrick Walton <pcwalton@mimiga.net> | 2014-09-17 08:24:32 -0700 |
| commit | aa841ae5080d11e82e50c98a37f961a9c49fbed2 (patch) | |
| tree | c1347f5e0fc17cd6266f758b6fabee5d35e94ebf | |
| parent | 11ba79894a13ddaee4bfcdd64d23fd4b54a041f3 (diff) | |
| parent | ee2b4e208f5e13b5ba04c93d4500beb7cc7f0bf3 (diff) | |
| download | servo-aa841ae5080d11e82e50c98a37f961a9c49fbed2.tar.gz servo-aa841ae5080d11e82e50c98a37f961a9c49fbed2.zip | |
Merge pull request #3376 from pcwalton/string-cache-race
build: Update string-cache to fix a nasty race
| -rw-r--r-- | Cargo.lock | 8 | ||||
| -rw-r--r-- | components/util/Cargo.toml | 1 | ||||
| -rw-r--r-- | ports/cef/Cargo.lock | 11 |
3 files changed, 12 insertions, 8 deletions
diff --git a/Cargo.lock b/Cargo.lock index 4ca58847391..29d8ea9cfc3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -411,17 +411,17 @@ source = "git+https://github.com/servo/rust-stb-image#f5022de4ad6bb474a03493d1f2 [[package]] name = "string_cache" version = "0.0.0" -source = "git+https://github.com/servo/string-cache#3e5a5178088729772d95fe8f1450511497e08289" +source = "git+https://github.com/servo/string-cache?ref=pre-rustup#df34aaaaed9c4598eef5f4445d28aeb5afac574a" dependencies = [ "phf 0.0.0 (git+https://github.com/sfackler/rust-phf#fa5d803428dd760287330571c919c7c5e11b2e1b)", "phf_mac 0.0.0 (git+https://github.com/sfackler/rust-phf#fa5d803428dd760287330571c919c7c5e11b2e1b)", - "string_cache_macros 0.0.0 (git+https://github.com/servo/string-cache#3e5a5178088729772d95fe8f1450511497e08289)", + "string_cache_macros 0.0.0 (git+https://github.com/servo/string-cache?ref=pre-rustup#df34aaaaed9c4598eef5f4445d28aeb5afac574a)", ] [[package]] name = "string_cache_macros" version = "0.0.0" -source = "git+https://github.com/servo/string-cache#3e5a5178088729772d95fe8f1450511497e08289" +source = "git+https://github.com/servo/string-cache?ref=pre-rustup#df34aaaaed9c4598eef5f4445d28aeb5afac574a" [[package]] name = "style" @@ -453,7 +453,7 @@ version = "0.0.1" dependencies = [ "azure 0.1.0 (git+https://github.com/servo/rust-azure#9c5567b79d8b87e8ef3b48c5842f453978035d21)", "geom 0.1.0 (git+https://github.com/servo/rust-geom#2982b770db6e5e3270305e0fd6b8068f6f80a489)", - "string_cache 0.0.0 (git+https://github.com/servo/string-cache#3e5a5178088729772d95fe8f1450511497e08289)", + "string_cache 0.0.0 (git+https://github.com/servo/string-cache?ref=pre-rustup#df34aaaaed9c4598eef5f4445d28aeb5afac574a)", "task_info 0.0.1", ] diff --git a/components/util/Cargo.toml b/components/util/Cargo.toml index 6f4824fd65a..1378fc1a051 100644 --- a/components/util/Cargo.toml +++ b/components/util/Cargo.toml @@ -18,4 +18,5 @@ path = "../../support/rust-task_info" [dependencies.string_cache] git = "https://github.com/servo/string-cache" +branch = "pre-rustup" diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index c0e95fb0fe4..8cb0a5cf586 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -269,6 +269,7 @@ dependencies = [ name = "layout" version = "0.0.1" dependencies = [ + "encoding 0.1.0 (git+https://github.com/lifthrasiir/rust-encoding#12b6610adff6eddc060691888c36017cd3ad57f7)", "geom 0.1.0 (git+https://github.com/servo/rust-geom#2982b770db6e5e3270305e0fd6b8068f6f80a489)", "gfx 0.0.1", "layout_traits 0.0.1", @@ -415,6 +416,7 @@ dependencies = [ "msg 0.0.1", "net 0.0.1", "script 0.0.1", + "url 0.1.0 (git+https://github.com/servo/rust-url#678bb4d52638b1cfdab78ef8e521566c9240fb1a)", "util 0.0.1", ] @@ -445,17 +447,17 @@ source = "git+https://github.com/servo/rust-stb-image#f5022de4ad6bb474a03493d1f2 [[package]] name = "string_cache" version = "0.0.0" -source = "git+https://github.com/servo/string-cache#3e5a5178088729772d95fe8f1450511497e08289" +source = "git+https://github.com/servo/string-cache?ref=pre-rustup#df34aaaaed9c4598eef5f4445d28aeb5afac574a" dependencies = [ "phf 0.0.0 (git+https://github.com/sfackler/rust-phf#fa5d803428dd760287330571c919c7c5e11b2e1b)", "phf_mac 0.0.0 (git+https://github.com/sfackler/rust-phf#fa5d803428dd760287330571c919c7c5e11b2e1b)", - "string_cache_macros 0.0.0 (git+https://github.com/servo/string-cache#3e5a5178088729772d95fe8f1450511497e08289)", + "string_cache_macros 0.0.0 (git+https://github.com/servo/string-cache?ref=pre-rustup#df34aaaaed9c4598eef5f4445d28aeb5afac574a)", ] [[package]] name = "string_cache_macros" version = "0.0.0" -source = "git+https://github.com/servo/string-cache#3e5a5178088729772d95fe8f1450511497e08289" +source = "git+https://github.com/servo/string-cache?ref=pre-rustup#df34aaaaed9c4598eef5f4445d28aeb5afac574a" [[package]] name = "style" @@ -487,7 +489,7 @@ version = "0.0.1" dependencies = [ "azure 0.1.0 (git+https://github.com/servo/rust-azure#9c5567b79d8b87e8ef3b48c5842f453978035d21)", "geom 0.1.0 (git+https://github.com/servo/rust-geom#2982b770db6e5e3270305e0fd6b8068f6f80a489)", - "string_cache 0.0.0 (git+https://github.com/servo/string-cache#3e5a5178088729772d95fe8f1450511497e08289)", + "string_cache 0.0.0 (git+https://github.com/servo/string-cache?ref=pre-rustup#df34aaaaed9c4598eef5f4445d28aeb5afac574a)", "task_info 0.0.1", ] @@ -495,3 +497,4 @@ dependencies = [ name = "xlib" version = "0.1.0" source = "git+https://github.com/servo/rust-xlib#79904fb42ff8a0e888f70fae336fbf6c11f1e6c8" + |