about summary refs log tree commit diff
path: root/src/libcollections
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-04-01 11:11:51 -0700
committerbors <bors@rust-lang.org>2014-04-01 11:11:51 -0700
commitb71c02e512fcfe18ea7a5a8a99ac758b4fa564a6 (patch)
tree7842aad2f7ad07256764e22d6ab2fad0b6f624ed /src/libcollections
parentb8ef9fd9c9f642ce7b8aed82782a1ed745d08d64 (diff)
parentbc7a2d72a3fea324fa432de9b6ce6073302d3d8c (diff)
downloadrust-b71c02e512fcfe18ea7a5a8a99ac758b4fa564a6.tar.gz
rust-b71c02e512fcfe18ea7a5a8a99ac758b4fa564a6.zip
auto merge of #13115 : huonw/rust/rand-errors, r=alexcrichton
move errno -> IoError converter into std, bubble up OSRng errors

Also adds a general errno -> `~str` converter to `std::os`, and makes the failure messages for the things using `OSRng` (e.g. (transitively) the task-local RNG, meaning hashmap initialisation failures aren't such a black box).
Diffstat (limited to 'src/libcollections')
-rw-r--r--src/libcollections/deque.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libcollections/deque.rs b/src/libcollections/deque.rs
index 9c1427d0225..6c1391e7ca8 100644
--- a/src/libcollections/deque.rs
+++ b/src/libcollections/deque.rs
@@ -52,7 +52,7 @@ pub mod bench {
                                                   map: &mut M,
                                                   bh: &mut BenchHarness) {
         // setup
-        let mut rng = rand::XorShiftRng::new();
+        let mut rng = rand::weak_rng();
 
         map.clear();
         for _ in range(0, n) {
@@ -89,7 +89,7 @@ pub mod bench {
                                                 map: &mut M,
                                                 bh: &mut BenchHarness) {
         // setup
-        let mut rng = rand::XorShiftRng::new();
+        let mut rng = rand::weak_rng();
         let mut keys = slice::from_fn(n, |_| rng.gen::<uint>() % n);
 
         for k in keys.iter() {