diff options
| author | Nick Cameron <ncameron@mozilla.com> | 2014-11-17 21:39:01 +1300 |
|---|---|---|
| committer | Nick Cameron <ncameron@mozilla.com> | 2014-11-17 22:41:33 +1300 |
| commit | ca08540a0039e827114752d11166ea8cb1387068 (patch) | |
| tree | 53b03a7c1563b089518fdcf1be7e9d789fdd0897 /src/libstd/rand | |
| parent | 803aacd5aef78f90fdd06ae7653fc20eec224992 (diff) | |
Fix fallout from coercion removal
Diffstat (limited to 'src/libstd/rand')
| -rw-r--r-- | src/libstd/rand/mod.rs | 12 | ||||
| -rw-r--r-- | src/libstd/rand/os.rs | 4 | ||||
| -rw-r--r-- | src/libstd/rand/reader.rs | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/libstd/rand/mod.rs b/src/libstd/rand/mod.rs index 5ef2c2fe23d..08eb7350bcf 100644 --- a/src/libstd/rand/mod.rs +++ b/src/libstd/rand/mod.rs @@ -522,7 +522,7 @@ mod test { #[test] fn test_choose() { let mut r = task_rng(); - assert_eq!(r.choose([1i, 1, 1]).map(|&x|x), Some(1)); + assert_eq!(r.choose(&[1i, 1, 1]).map(|&x|x), Some(1)); let v: &[int] = &[]; assert_eq!(r.choose(v), None); @@ -534,16 +534,16 @@ mod test { let empty: &mut [int] = &mut []; r.shuffle(empty); let mut one = [1i]; - r.shuffle(one); + r.shuffle(&mut one); let b: &[_] = &[1]; assert_eq!(one.as_slice(), b); let mut two = [1i, 2]; - r.shuffle(two); + r.shuffle(&mut two); assert!(two == [1, 2] || two == [2, 1]); let mut x = [1i, 1, 1]; - r.shuffle(x); + r.shuffle(&mut x); let b: &[_] = &[1, 1, 1]; assert_eq!(x.as_slice(), b); } @@ -553,7 +553,7 @@ mod test { let mut r = task_rng(); r.gen::<int>(); let mut v = [1i, 1, 1]; - r.shuffle(v); + r.shuffle(&mut v); let b: &[_] = &[1, 1, 1]; assert_eq!(v.as_slice(), b); assert_eq!(r.gen_range(0u, 1u), 0u); @@ -673,7 +673,7 @@ mod bench { #[bench] fn rand_shuffle_100(b: &mut Bencher) { let mut rng = weak_rng(); - let x : &mut[uint] = [1,..100]; + let x : &mut[uint] = &mut [1,..100]; b.iter(|| { rng.shuffle(x); }) diff --git a/src/libstd/rand/os.rs b/src/libstd/rand/os.rs index 6bf259d201e..83ea57e5538 100644 --- a/src/libstd/rand/os.rs +++ b/src/libstd/rand/os.rs @@ -343,7 +343,7 @@ mod test { r.next_u64(); let mut v = [0u8, .. 1000]; - r.fill_bytes(v); + r.fill_bytes(&mut v); } #[test] @@ -368,7 +368,7 @@ mod test { task::deschedule(); r.next_u64(); task::deschedule(); - r.fill_bytes(v); + r.fill_bytes(&mut v); task::deschedule(); } }) diff --git a/src/libstd/rand/reader.rs b/src/libstd/rand/reader.rs index ab3216e93a0..796bf7853f7 100644 --- a/src/libstd/rand/reader.rs +++ b/src/libstd/rand/reader.rs @@ -108,7 +108,7 @@ mod test { let mut w = [0u8, .. 8]; let mut rng = ReaderRng::new(MemReader::new(v.as_slice().to_vec())); - rng.fill_bytes(w); + rng.fill_bytes(&mut w); assert!(v == w); } @@ -118,6 +118,6 @@ mod test { fn test_reader_rng_insufficient_bytes() { let mut rng = ReaderRng::new(MemReader::new(vec!())); let mut v = [0u8, .. 3]; - rng.fill_bytes(v); + rng.fill_bytes(&mut v); } } |
