diff options
| author | bors <bors@rust-lang.org> | 2018-09-05 03:04:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-09-05 03:04:20 +0000 |
| commit | 0be2c303692cab31390e52701007cfa87867bf74 (patch) | |
| tree | a7a48f343f3573463febf77234d4d674f524d522 /src/liballoc | |
| parent | f68b7cc59896427d378c9e3bae6f5fd7a1f1fad9 (diff) | |
| parent | 9ec5ef541ad17986bfe6ae067a84ea8f7b7ae133 (diff) | |
| download | rust-0be2c303692cab31390e52701007cfa87867bf74.tar.gz rust-0be2c303692cab31390e52701007cfa87867bf74.zip | |
Auto merge of #53075 - Mark-Simulacrum:update-cargolock, r=alexcrichton
Update Cargo.lock This also includes major version bumps for the rand crate used by core, std, and alloc tests, among other crates (regex, etc.) used elsewhere. Since these are all internal there should be no user-visible changes. r? @alexcrichton
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/Cargo.toml | 2 | ||||
| -rw-r--r-- | src/liballoc/collections/linked_list.rs | 2 | ||||
| -rw-r--r-- | src/liballoc/tests/slice.rs | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/liballoc/Cargo.toml b/src/liballoc/Cargo.toml index 1dad323769a..642a43d4d9c 100644 --- a/src/liballoc/Cargo.toml +++ b/src/liballoc/Cargo.toml @@ -14,7 +14,7 @@ core = { path = "../libcore" } compiler_builtins = { path = "../rustc/compiler_builtins_shim" } [dev-dependencies] -rand = "0.4" +rand = "0.5" [[test]] name = "collectionstests" diff --git a/src/liballoc/collections/linked_list.rs b/src/liballoc/collections/linked_list.rs index 9844de9a57d..2ef84dbade0 100644 --- a/src/liballoc/collections/linked_list.rs +++ b/src/liballoc/collections/linked_list.rs @@ -1222,7 +1222,7 @@ mod tests { use std::thread; use std::vec::Vec; - use rand::{thread_rng, Rng}; + use rand::{thread_rng, RngCore}; use super::{LinkedList, Node}; diff --git a/src/liballoc/tests/slice.rs b/src/liballoc/tests/slice.rs index df5e18a9a18..f33bf64d40b 100644 --- a/src/liballoc/tests/slice.rs +++ b/src/liballoc/tests/slice.rs @@ -18,7 +18,8 @@ use std::sync::atomic::Ordering::Relaxed; use std::sync::atomic::{ATOMIC_USIZE_INIT, AtomicUsize}; use std::thread; -use rand::{Rng, thread_rng}; +use rand::{Rng, RngCore, thread_rng}; +use rand::distributions::Standard; fn square(n: usize) -> usize { n * n @@ -405,7 +406,7 @@ fn test_sort() { for len in (2..25).chain(500..510) { for &modulus in &[5, 10, 100, 1000] { for _ in 0..10 { - let orig: Vec<_> = rng.gen_iter::<i32>() + let orig: Vec<_> = rng.sample_iter::<i32, _>(&Standard) .map(|x| x % modulus) .take(len) .collect(); |
