about summary refs log tree commit diff
path: root/src/librand
diff options
context:
space:
mode:
authorSteven Fackler <sfackler@gmail.com>2014-03-26 22:46:25 -0700
committerSteven Fackler <sfackler@gmail.com>2014-04-06 15:40:01 -0700
commit49a80810950a2f2ea12f5efd4cf188cb68cb1283 (patch)
tree093ff0d95856e003e28560bc224cac574a003461 /src/librand
parentd0e60b72ee3f5fb07b01143d82362cb42307f32d (diff)
downloadrust-49a80810950a2f2ea12f5efd4cf188cb68cb1283.tar.gz
rust-49a80810950a2f2ea12f5efd4cf188cb68cb1283.zip
De-~[] Mem{Reader,Writer}
Diffstat (limited to 'src/librand')
-rw-r--r--src/librand/reader.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/librand/reader.rs b/src/librand/reader.rs
index dff821d8329..025dc2a2575 100644
--- a/src/librand/reader.rs
+++ b/src/librand/reader.rs
@@ -23,7 +23,7 @@ use Rng;
 /// use rand::{reader, Rng};
 /// use std::io::MemReader;
 ///
-/// let mut rng = reader::ReaderRng::new(MemReader::new(~[1,2,3,4,5,6,7,8]));
+/// let mut rng = reader::ReaderRng::new(MemReader::new(vec!(1,2,3,4,5,6,7,8)));
 /// println!("{:x}", rng.gen::<uint>());
 /// ```
 pub struct ReaderRng<R> {
@@ -80,7 +80,7 @@ mod test {
         // transmute from the target to avoid endianness concerns.
         let v = ~[1u64, 2u64, 3u64];
         let bytes: ~[u8] = unsafe {cast::transmute(v)};
-        let mut rng = ReaderRng::new(MemReader::new(bytes));
+        let mut rng = ReaderRng::new(MemReader::new(bytes.move_iter().collect()));
 
         assert_eq!(rng.next_u64(), 1);
         assert_eq!(rng.next_u64(), 2);
@@ -91,7 +91,7 @@ mod test {
         // transmute from the target to avoid endianness concerns.
         let v = ~[1u32, 2u32, 3u32];
         let bytes: ~[u8] = unsafe {cast::transmute(v)};
-        let mut rng = ReaderRng::new(MemReader::new(bytes));
+        let mut rng = ReaderRng::new(MemReader::new(bytes.move_iter().collect()));
 
         assert_eq!(rng.next_u32(), 1);
         assert_eq!(rng.next_u32(), 2);
@@ -102,7 +102,7 @@ mod test {
         let v = [1u8, 2, 3, 4, 5, 6, 7, 8];
         let mut w = [0u8, .. 8];
 
-        let mut rng = ReaderRng::new(MemReader::new(v.to_owned()));
+        let mut rng = ReaderRng::new(MemReader::new(Vec::from_slice(v)));
         rng.fill_bytes(w);
 
         assert!(v == w);
@@ -111,7 +111,7 @@ mod test {
     #[test]
     #[should_fail]
     fn test_reader_rng_insufficient_bytes() {
-        let mut rng = ReaderRng::new(MemReader::new(~[]));
+        let mut rng = ReaderRng::new(MemReader::new(vec!()));
         let mut v = [0u8, .. 3];
         rng.fill_bytes(v);
     }