about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-12-06 14:53:37 +0000
committerbors <bors@rust-lang.org>2017-12-06 14:53:37 +0000
commit833785b090c30d4a359d901fb41bfafbe1607ce9 (patch)
tree3bae34d8913ec84c8325bd31096b16368fcdca41 /src/liballoc
parent632ad19135a1f38c42761270ffc8a0d977b1db4c (diff)
parentbb239e294ee35aab4ddd7c7a306d0bf5bd8518b6 (diff)
downloadrust-833785b090c30d4a359d901fb41bfafbe1607ce9.tar.gz
rust-833785b090c30d4a359d901fb41bfafbe1607ce9.zip
Auto merge of #46538 - frewsxcv:rollup, r=frewsxcv
Rollup of 7 pull requests

- Successful merges: #46136, #46378, #46431, #46483, #46495, #46502, #46512
- Failed merges:
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/benches/btree/map.rs2
-rw-r--r--src/liballoc/benches/slice.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/liballoc/benches/btree/map.rs b/src/liballoc/benches/btree/map.rs
index 744afb991b0..20b9091a07b 100644
--- a/src/liballoc/benches/btree/map.rs
+++ b/src/liballoc/benches/btree/map.rs
@@ -12,7 +12,7 @@
 use std::iter::Iterator;
 use std::vec::Vec;
 use std::collections::BTreeMap;
-use std::__rand::{Rng, thread_rng};
+use rand::{Rng, thread_rng};
 use test::{Bencher, black_box};
 
 macro_rules! map_insert_rand_bench {
diff --git a/src/liballoc/benches/slice.rs b/src/liballoc/benches/slice.rs
index d99270e7f31..17538d885f8 100644
--- a/src/liballoc/benches/slice.rs
+++ b/src/liballoc/benches/slice.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::__rand::{thread_rng};
+use rand::{thread_rng};
 use std::mem;
 use std::ptr;