about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2017-11-01 12:32:13 -0700
committerAlex Crichton <alex@alexcrichton.com>2017-11-08 20:41:17 -0800
commit6bc8f164b09b9994e6a2d4c4ca60d7d36c09d3fe (patch)
tree29cb9e3ac618cf4696aef88153c6fb2d48da3ee4 /src/liballoc
parentfc77b623d3072005f35e320e652f2b31695d493c (diff)
downloadrust-6bc8f164b09b9994e6a2d4c4ca60d7d36c09d3fe.tar.gz
rust-6bc8f164b09b9994e6a2d4c4ca60d7d36c09d3fe.zip
std: Remove `rand` crate and module
This commit removes the `rand` crate from the standard library facade as
well as the `__rand` module in the standard library. Neither of these
were used in any meaningful way in the standard library itself. The only
need for randomness in libstd is to initialize the thread-local keys of
a `HashMap`, and that unconditionally used `OsRng` defined in the
standard library anyway.

The cruft of the `rand` crate and the extra `rand` support in the
standard library makes libstd slightly more difficult to port to new
platforms, namely WebAssembly which doesn't have any randomness at all
(without interfacing with JS). The purpose of this commit is to clarify
and streamline randomness in libstd, focusing on how it's only required
in one location, hashmap seeds.

Note that the `rand` crate out of tree has almost always been a drop-in
replacement for the `rand` crate in-tree, so any usage (accidental or
purposeful) of the crate in-tree should switch to the `rand` crate on
crates.io. This then also has the further benefit of avoiding
duplication (mostly) between the two crates!
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/Cargo.toml3
-rw-r--r--src/liballoc/lib.rs2
-rw-r--r--src/liballoc/linked_list.rs3
-rw-r--r--src/liballoc/tests/lib.rs1
-rw-r--r--src/liballoc/tests/slice.rs3
5 files changed, 10 insertions, 2 deletions
diff --git a/src/liballoc/Cargo.toml b/src/liballoc/Cargo.toml
index 686e5681d12..0a265ee1376 100644
--- a/src/liballoc/Cargo.toml
+++ b/src/liballoc/Cargo.toml
@@ -11,6 +11,9 @@ path = "lib.rs"
 core = { path = "../libcore" }
 std_unicode = { path = "../libstd_unicode" }
 
+[dev-dependencies]
+rand = "0.3"
+
 [[test]]
 name = "collectionstests"
 path = "../liballoc/tests/lib.rs"
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs
index a40ed060604..3cc3ea46796 100644
--- a/src/liballoc/lib.rs
+++ b/src/liballoc/lib.rs
@@ -135,6 +135,8 @@
 extern crate std;
 #[cfg(test)]
 extern crate test;
+#[cfg(test)]
+extern crate rand;
 
 extern crate std_unicode;
 
diff --git a/src/liballoc/linked_list.rs b/src/liballoc/linked_list.rs
index f897feb7afa..fac6acaca61 100644
--- a/src/liballoc/linked_list.rs
+++ b/src/liballoc/linked_list.rs
@@ -1269,10 +1269,11 @@ unsafe impl<'a, T: Sync> Sync for IterMut<'a, T> {}
 
 #[cfg(test)]
 mod tests {
-    use std::__rand::{thread_rng, Rng};
     use std::thread;
     use std::vec::Vec;
 
+    use rand::{thread_rng, Rng};
+
     use super::{LinkedList, Node};
 
     #[cfg(test)]
diff --git a/src/liballoc/tests/lib.rs b/src/liballoc/tests/lib.rs
index c5beb63d12e..00ebd88d464 100644
--- a/src/liballoc/tests/lib.rs
+++ b/src/liballoc/tests/lib.rs
@@ -30,6 +30,7 @@
 #![feature(unicode)]
 
 extern crate std_unicode;
+extern crate rand;
 
 use std::hash::{Hash, Hasher};
 use std::collections::hash_map::DefaultHasher;
diff --git a/src/liballoc/tests/slice.rs b/src/liballoc/tests/slice.rs
index c53bf15f1bf..85d5ce304b8 100644
--- a/src/liballoc/tests/slice.rs
+++ b/src/liballoc/tests/slice.rs
@@ -10,9 +10,10 @@
 
 use std::cmp::Ordering::{Equal, Greater, Less};
 use std::mem;
-use std::__rand::{Rng, thread_rng};
 use std::rc::Rc;
 
+use rand::{Rng, thread_rng};
+
 fn square(n: usize) -> usize {
     n * n
 }