Skip to content

Commit 700e627

Browse files
alexcrichtonalexcrichton
committed
test: Fixup many library unit tests
1 parent dddfbe0 commit 700e627

File tree

26 files changed

+105
-479
lines changed

26 files changed

+105
-479
lines changed

‎src/libcollections/linked_list.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -943,7 +943,7 @@ mod test {
943943
use std::clone::Clone;
944944
use std::iter::Iterator;
945945
use std::option::Option::{Some, None, self};
946-
use std::rand;
946+
use std::__rand::{thread_rng, Rng};
947947
use std::thread;
948948
use std::vec::Vec;
949949

@@ -1095,7 +1095,7 @@ mod test {
10951095
let mut v = vec![];
10961096
for i in 0..sz {
10971097
check_links(&m);
1098-
let r: u8 = rand::random();
1098+
let r: u8 = thread_rng().next_u32() as u8;
10991099
match r % 6 {
11001100
0 => {
11011101
m.pop_back();

‎src/libcollectionstest/bench.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,13 @@ macro_rules! map_insert_rand_bench {
1212
($name: ident, $n: expr, $map: ident) => (
1313
#[bench]
1414
pub fn $name(b: &mut ::test::Bencher) {
15-
use std::rand;
16-
use std::rand::Rng;
15+
use std::__rand::{thread_rng, Rng};
1716
use test::black_box;
1817

1918
let n: usize = $n;
2019
let mut map = $map::new();
2120
// setup
22-
let mut rng = rand::weak_rng();
21+
let mut rng = thread_rng();
2322

2423
for _ in 0..n {
2524
let i = rng.gen::<usize>() % n;
@@ -67,16 +66,15 @@ macro_rules! map_find_rand_bench {
6766
#[bench]
6867
pub fn $name(b: &mut ::test::Bencher) {
6968
use std::iter::Iterator;
70-
use std::rand::Rng;
71-
use std::rand;
69+
use std::__rand::{thread_rng, Rng};
7270
use std::vec::Vec;
7371
use test::black_box;
7472

7573
let mut map = $map::new();
7674
let n: usize = $n;
7775

7876
// setup
79-
let mut rng = rand::weak_rng();
77+
let mut rng = rand::thread_rng();
8078
let mut keys: Vec<_> = (0..n).map(|_| rng.gen::<usize>() % n).collect();
8179

8280
for &k in &keys {

‎src/libcollectionstest/bit/vec.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -633,15 +633,14 @@ fn test_bit_vec_extend() {
633633
mod bench {
634634
use std::collections::BitVec;
635635
use std::u32;
636-
use std::rand::{Rng, self};
636+
use std::__rand::{Rng, thread_rng};
637637

638638
use test::{Bencher, black_box};
639639

640640
const BENCH_BITS : usize = 1 << 14;
641641

642-
fn rng() -> rand::IsaacRng {
643-
let seed: &[_] = &[1, 2, 3, 4, 5, 6, 7, 8, 9, 0];
644-
rand::SeedableRng::from_seed(seed)
642+
fn rng() -> ThreadRng {
643+
thread_rng()
645644
}
646645

647646
#[bench]

‎src/libcollectionstest/btree/map.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ fn test_entry(){
251251

252252
mod bench {
253253
use std::collections::BTreeMap;
254-
use std::rand::{Rng, weak_rng};
254+
use std::rand::{Rng, thread_rng};
255255

256256
use test::{Bencher, black_box};
257257

@@ -269,7 +269,7 @@ mod bench {
269269

270270
fn bench_iter(b: &mut Bencher, size: i32) {
271271
let mut map = BTreeMap::<i32, i32>::new();
272-
let mut rng = weak_rng();
272+
let mut rng = thread_rng();
273273

274274
for _ in 0..size {
275275
map.insert(rng.gen(), rng.gen());

‎src/libcollectionstest/slice.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1296,7 +1296,7 @@ fn test_to_vec() {
12961296
mod bench {
12971297
use std::iter::repeat;
12981298
use std::{mem, ptr};
1299-
use std::rand::{Rng, weak_rng};
1299+
use std::rand::{Rng, thread_rng};
13001300

13011301
use test::{Bencher, black_box};
13021302

@@ -1465,7 +1465,7 @@ mod bench {
14651465

14661466
#[bench]
14671467
fn random_inserts(b: &mut Bencher) {
1468-
let mut rng = weak_rng();
1468+
let mut rng = thread_rng();
14691469
b.iter(|| {
14701470
let mut v: Vec<_> = repeat((0, 0)).take(30).collect();
14711471
for _ in 0..100 {
@@ -1477,7 +1477,7 @@ mod bench {
14771477
}
14781478
#[bench]
14791479
fn random_removes(b: &mut Bencher) {
1480-
let mut rng = weak_rng();
1480+
let mut rng = thread_rng();
14811481
b.iter(|| {
14821482
let mut v: Vec<_> = repeat((0, 0)).take(130).collect();
14831483
for _ in 0..100 {
@@ -1489,7 +1489,7 @@ mod bench {
14891489

14901490
#[bench]
14911491
fn sort_random_small(b: &mut Bencher) {
1492-
let mut rng = weak_rng();
1492+
let mut rng = thread_rng();
14931493
b.iter(|| {
14941494
let mut v: Vec<_> = rng.gen_iter::<u64>().take(5).collect();
14951495
v.sort();
@@ -1499,7 +1499,7 @@ mod bench {
14991499

15001500
#[bench]
15011501
fn sort_random_medium(b: &mut Bencher) {
1502-
let mut rng = weak_rng();
1502+
let mut rng = thread_rng();
15031503
b.iter(|| {
15041504
let mut v: Vec<_> = rng.gen_iter::<u64>().take(100).collect();
15051505
v.sort();
@@ -1509,7 +1509,7 @@ mod bench {
15091509

15101510
#[bench]
15111511
fn sort_random_large(b: &mut Bencher) {
1512-
let mut rng = weak_rng();
1512+
let mut rng = thread_rng();
15131513
b.iter(|| {
15141514
let mut v: Vec<_> = rng.gen_iter::<u64>().take(10000).collect();
15151515
v.sort();
@@ -1530,7 +1530,7 @@ mod bench {
15301530

15311531
#[bench]
15321532
fn sort_big_random_small(b: &mut Bencher) {
1533-
let mut rng = weak_rng();
1533+
let mut rng = thread_rng();
15341534
b.iter(|| {
15351535
let mut v = rng.gen_iter::<BigSortable>().take(5)
15361536
.collect::<Vec<BigSortable>>();
@@ -1541,7 +1541,7 @@ mod bench {
15411541

15421542
#[bench]
15431543
fn sort_big_random_medium(b: &mut Bencher) {
1544-
let mut rng = weak_rng();
1544+
let mut rng = thread_rng();
15451545
b.iter(|| {
15461546
let mut v = rng.gen_iter::<BigSortable>().take(100)
15471547
.collect::<Vec<BigSortable>>();
@@ -1552,7 +1552,7 @@ mod bench {
15521552

15531553
#[bench]
15541554
fn sort_big_random_large(b: &mut Bencher) {
1555-
let mut rng = weak_rng();
1555+
let mut rng = thread_rng();
15561556
b.iter(|| {
15571557
let mut v = rng.gen_iter::<BigSortable>().take(10000)
15581558
.collect::<Vec<BigSortable>>();

‎src/libcoretest/fmt/num.rs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -169,85 +169,85 @@ fn test_radix_base_too_large() {
169169
mod u32 {
170170
use test::Bencher;
171171
use core::fmt::radix;
172-
use std::rand::{weak_rng, Rng};
172+
use std::__rand::{thread_rng, Rng};
173173
use std::io::{Write, sink};
174174

175175
#[bench]
176176
fn format_bin(b: &mut Bencher) {
177-
let mut rng = weak_rng();
177+
let mut rng = thread_rng();
178178
b.iter(|| { write!(&mut sink(), "{:b}", rng.gen::<u32>()) })
179179
}
180180

181181
#[bench]
182182
fn format_oct(b: &mut Bencher) {
183-
let mut rng = weak_rng();
183+
let mut rng = thread_rng();
184184
b.iter(|| { write!(&mut sink(), "{:o}", rng.gen::<u32>()) })
185185
}
186186

187187
#[bench]
188188
fn format_dec(b: &mut Bencher) {
189-
let mut rng = weak_rng();
189+
let mut rng = thread_rng();
190190
b.iter(|| { write!(&mut sink(), "{}", rng.gen::<u32>()) })
191191
}
192192

193193
#[bench]
194194
fn format_hex(b: &mut Bencher) {
195-
let mut rng = weak_rng();
195+
let mut rng = thread_rng();
196196
b.iter(|| { write!(&mut sink(), "{:x}", rng.gen::<u32>()) })
197197
}
198198

199199
#[bench]
200200
fn format_show(b: &mut Bencher) {
201-
let mut rng = weak_rng();
201+
let mut rng = thread_rng();
202202
b.iter(|| { write!(&mut sink(), "{:?}", rng.gen::<u32>()) })
203203
}
204204

205205
#[bench]
206206
fn format_base_36(b: &mut Bencher) {
207-
let mut rng = weak_rng();
207+
let mut rng = thread_rng();
208208
b.iter(|| { write!(&mut sink(), "{}", radix(rng.gen::<u32>(), 36)) })
209209
}
210210
}
211211

212212
mod i32 {
213213
use test::Bencher;
214214
use core::fmt::radix;
215-
use std::rand::{weak_rng, Rng};
215+
use std::__rand::{thread_rng, Rng};
216216
use std::io::{Write, sink};
217217

218218
#[bench]
219219
fn format_bin(b: &mut Bencher) {
220-
let mut rng = weak_rng();
220+
let mut rng = thread_rng();
221221
b.iter(|| { write!(&mut sink(), "{:b}", rng.gen::<i32>()) })
222222
}
223223

224224
#[bench]
225225
fn format_oct(b: &mut Bencher) {
226-
let mut rng = weak_rng();
226+
let mut rng = thread_rng();
227227
b.iter(|| { write!(&mut sink(), "{:o}", rng.gen::<i32>()) })
228228
}
229229

230230
#[bench]
231231
fn format_dec(b: &mut Bencher) {
232-
let mut rng = weak_rng();
232+
let mut rng = thread_rng();
233233
b.iter(|| { write!(&mut sink(), "{}", rng.gen::<i32>()) })
234234
}
235235

236236
#[bench]
237237
fn format_hex(b: &mut Bencher) {
238-
let mut rng = weak_rng();
238+
let mut rng = thread_rng();
239239
b.iter(|| { write!(&mut sink(), "{:x}", rng.gen::<i32>()) })
240240
}
241241

242242
#[bench]
243243
fn format_show(b: &mut Bencher) {
244-
let mut rng = weak_rng();
244+
let mut rng = thread_rng();
245245
b.iter(|| { write!(&mut sink(), "{:?}", rng.gen::<i32>()) })
246246
}
247247

248248
#[bench]
249249
fn format_base_36(b: &mut Bencher) {
250-
let mut rng = weak_rng();
250+
let mut rng = thread_rng();
251251
b.iter(|| { write!(&mut sink(), "{}", radix(rng.gen::<i32>(), 36)) })
252252
}
253253
}

‎src/libflate/lib.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,12 +155,11 @@ pub fn inflate_bytes_zlib(bytes: &[u8]) -> Result<Bytes,Error> {
155155
mod tests {
156156
#![allow(deprecated)]
157157
use super::{inflate_bytes, deflate_bytes};
158-
use std::rand;
159-
use std::rand::Rng;
158+
use std::__rand::{thread_rng, Rng};
160159

161160
#[test]
162161
fn test_flate_round_trip() {
163-
let mut r = rand::thread_rng();
162+
let mut r = thread_rng();
164163
let mut words = vec![];
165164
for _ in 0..20 {
166165
let range = r.gen_range(1, 10);

‎src/librand/lib.rs

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -516,25 +516,21 @@ pub struct Closed01<F>(pub F);
516516

517517
#[cfg(test)]
518518
mod test {
519-
use std::rand;
519+
use std::__rand as rand;
520520

521-
pub struct MyRng<R> { inner: R }
521+
pub struct MyRng { inner: Box<rand::Rng> }
522522

523523
impl<R: rand::Rng> ::Rng for MyRng<R> {
524524
fn next_u32(&mut self) -> u32 {
525-
fn next<T: rand::Rng>(t: &mut T) -> u32 {
526-
use std::rand::Rng;
527-
t.next_u32()
528-
}
529-
next(&mut self.inner)
525+
rand::Rng::next_u32(&mut self.inner)
530526
}
531527
}
532528

533529
pub fn rng() -> MyRng<rand::ThreadRng> {
534-
MyRng { inner: rand::thread_rng() }
530+
MyRng { inner: Box::new(rand::thread_rng()) }
535531
}
536532

537-
pub fn weak_rng() -> MyRng<rand::XorShiftRng> {
538-
MyRng { inner: rand::weak_rng() }
533+
pub fn weak_rng() -> MyRng<rand::ThreadRng> {
534+
MyRng { inner: Box::new(rand::thread_rng()) }
539535
}
540536
}

‎src/librand/rand_impls.rs

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -211,55 +211,3 @@ impl<T:Rand> Rand for Option<T> {
211211
}
212212
}
213213
}
214-
215-
#[cfg(test)]
216-
mod tests {
217-
use std::rand::{Rng, thread_rng, Open01, Closed01};
218-
219-
struct ConstantRng(u64);
220-
impl Rng for ConstantRng {
221-
fn next_u32(&mut self) -> u32 {
222-
let ConstantRng(v) = *self;
223-
v as u32
224-
}
225-
fn next_u64(&mut self) -> u64 {
226-
let ConstantRng(v) = *self;
227-
v
228-
}
229-
}
230-
231-
#[test]
232-
fn floating_point_edge_cases() {
233-
// the test for exact equality is correct here.
234-
assert!(ConstantRng(0xffff_ffff).gen::<f32>() != 1.0);
235-
assert!(ConstantRng(0xffff_ffff_ffff_ffff).gen::<f64>() != 1.0);
236-
}
237-
238-
#[test]
239-
fn rand_open() {
240-
// this is unlikely to catch an incorrect implementation that
241-
// generates exactly 0 or 1, but it keeps it sane.
242-
let mut rng = thread_rng();
243-
for _ in 0..1_000 {
244-
// strict inequalities
245-
let Open01(f) = rng.gen::<Open01<f64>>();
246-
assert!(0.0 < f && f < 1.0);
247-
248-
let Open01(f) = rng.gen::<Open01<f32>>();
249-
assert!(0.0 < f && f < 1.0);
250-
}
251-
}
252-
253-
#[test]
254-
fn rand_closed() {
255-
let mut rng = thread_rng();
256-
for _ in 0..1_000 {
257-
// strict inequalities
258-
let Closed01(f) = rng.gen::<Closed01<f64>>();
259-
assert!(0.0 <= f && f <= 1.0);
260-
261-
let Closed01(f) = rng.gen::<Closed01<f32>>();
262-
assert!(0.0 <= f && f <= 1.0);
263-
}
264-
}
265-
}

‎src/librustc_back/fs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ pub fn realpath(original: &Path) -> io::Result<PathBuf> {
6868
mod test {
6969
use tempdir::TempDir;
7070
use std::fs::{self, File};
71-
use std::path::{Path, PathBuf};
71+
use super::realpath;
7272

7373
#[test]
7474
fn realpath_works() {

0 commit comments

Comments
 (0)