From e555e46c85ed655f8159f8b2c8b664cad2c6d89e Mon Sep 17 00:00:00 2001 From: Matt Brubeck Date: Thu, 19 Mar 2015 17:33:48 -0600 Subject: [PATCH] servo: Merge #5280 - Use the same version of rand everywhere (from mbrubeck:rand); r=larsbergstrom r? @larsbergstrom Source-Repo: https://github.com/servo/servo Source-Revision: 794d9f696a7a1c80afec44badfb151c047239cd7 --- servo/components/servo/Cargo.lock | 13 ++----------- servo/ports/cef/Cargo.lock | 13 ++----------- servo/ports/gonk/Cargo.lock | 13 ++----------- 3 files changed, 6 insertions(+), 33 deletions(-) diff --git a/servo/components/servo/Cargo.lock b/servo/components/servo/Cargo.lock index 2834d5d0c199..680b98486f15 100644 --- a/servo/components/servo/Cargo.lock +++ b/servo/components/servo/Cargo.lock @@ -706,15 +706,6 @@ dependencies = [ "log 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "rand" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "regex" version = "0.1.18" @@ -810,7 +801,7 @@ dependencies = [ "lazy_static 0.1.8 (git+https://github.com/Kimundi/lazy-static.rs)", "phf 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", "phf_macros 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.0.0 (git+https://github.com/servo/string-cache)", ] @@ -895,7 +886,7 @@ dependencies = [ "lazy_static 0.1.8 (git+https://github.com/Kimundi/lazy-static.rs)", "libc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", - "rand 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", diff --git a/servo/ports/cef/Cargo.lock b/servo/ports/cef/Cargo.lock index 83edef2900c6..dcb351953e5e 100644 --- a/servo/ports/cef/Cargo.lock +++ b/servo/ports/cef/Cargo.lock @@ -712,15 +712,6 @@ dependencies = [ "log 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "rand" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "regex" version = "0.1.18" @@ -835,7 +826,7 @@ dependencies = [ "lazy_static 0.1.8 (git+https://github.com/Kimundi/lazy-static.rs)", "phf 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", "phf_macros 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.0.0 (git+https://github.com/servo/string-cache)", ] @@ -920,7 +911,7 @@ dependencies = [ "lazy_static 0.1.8 (git+https://github.com/Kimundi/lazy-static.rs)", "libc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", - "rand 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)", diff --git a/servo/ports/gonk/Cargo.lock b/servo/ports/gonk/Cargo.lock index 9ab2732a7c50..b4ea096e746e 100644 --- a/servo/ports/gonk/Cargo.lock +++ b/servo/ports/gonk/Cargo.lock @@ -636,15 +636,6 @@ dependencies = [ "log 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "rand" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "regex" version = "0.1.18" @@ -758,7 +749,7 @@ dependencies = [ "lazy_static 0.1.8 (git+https://github.com/Kimundi/lazy-static.rs)", "phf 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", "phf_macros 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_plugin 0.0.0 (git+https://github.com/servo/string-cache)", ] @@ -835,7 +826,7 @@ dependencies = [ "lazy_static 0.1.8 (git+https://github.com/Kimundi/lazy-static.rs)", "libc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", - "rand 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "selectors 0.1.0 (git+https://github.com/servo/rust-selectors)",