More improvements to std::rand

mk/rt.mk

@@ -86,7 +86,6 @@ RUNTIME_CXXS_$(1)_$(2) := \
               rt/sync/lock_and_signal.cpp \
               rt/sync/rust_thread.cpp \
               rt/rust_builtin.cpp \
-              rt/rust_rng.cpp \
               rt/rust_upcall.cpp \
               rt/rust_uv.cpp \
               rt/miniz.cpp \

src/libextra/bitv.rs

@@ -1524,16 +1524,16 @@ mod tests {
     }
 
     fn rng() -> rand::IsaacRng {
-        let seed = [1, 2, 3, 4, 5, 6, 7, 8, 9, 0];
-        rand::IsaacRng::new_seeded(seed)
+        let seed = &[1, 2, 3, 4, 5, 6, 7, 8, 9, 0];
+        rand::SeedableRng::from_seed(seed)
     }
 
     #[bench]
     fn bench_uint_small(b: &mut BenchHarness) {
         let mut r = rng();
         let mut bitv = 0 as uint;
         do b.iter {
-            bitv |= (1 << ((r.next() as uint) % uint::bits));
+            bitv |= (1 << ((r.next_u32() as uint) % uint::bits));
         }
     }
 
@@ -1542,7 +1542,7 @@ mod tests {
         let mut r = rng();
         let mut bitv = SmallBitv::new(uint::bits);
         do b.iter {
-            bitv.set((r.next() as uint) % uint::bits, true);
+            bitv.set((r.next_u32() as uint) % uint::bits, true);
         }
     }
 
@@ -1551,7 +1551,7 @@ mod tests {
         let mut r = rng();
         let mut bitv = BigBitv::new(~[0]);
         do b.iter {
-            bitv.set((r.next() as uint) % uint::bits, true);
+            bitv.set((r.next_u32() as uint) % uint::bits, true);
         }
     }
 
@@ -1562,7 +1562,7 @@ mod tests {
         storage.grow(BENCH_BITS / uint::bits, &0u);
         let mut bitv = BigBitv::new(storage);
         do b.iter {
-            bitv.set((r.next() as uint) % BENCH_BITS, true);
+            bitv.set((r.next_u32() as uint) % BENCH_BITS, true);
         }
     }
 
@@ -1571,7 +1571,7 @@ mod tests {
         let mut r = rng();
         let mut bitv = Bitv::new(BENCH_BITS, false);
         do b.iter {
-            bitv.set((r.next() as uint) % BENCH_BITS, true);
+            bitv.set((r.next_u32() as uint) % BENCH_BITS, true);
         }
     }
 
@@ -1580,7 +1580,7 @@ mod tests {
         let mut r = rng();
         let mut bitv = Bitv::new(uint::bits, false);
         do b.iter {
-            bitv.set((r.next() as uint) % uint::bits, true);
+            bitv.set((r.next_u32() as uint) % uint::bits, true);
         }
     }
 
@@ -1589,7 +1589,7 @@ mod tests {
         let mut r = rng();
         let mut bitv = BitvSet::new();
         do b.iter {
-            bitv.insert((r.next() as uint) % uint::bits);
+            bitv.insert((r.next_u32() as uint) % uint::bits);
         }
     }
 
@@ -1598,7 +1598,7 @@ mod tests {
         let mut r = rng();
         let mut bitv = BitvSet::new();
         do b.iter {
-            bitv.insert((r.next() as uint) % BENCH_BITS);
+            bitv.insert((r.next_u32() as uint) % BENCH_BITS);
         }
     }
 

src/libextra/treemap.rs

@@ -1013,7 +1013,7 @@ mod test_treemap {
         check_equal(ctrl, &map);
         assert!(map.find(&5).is_none());
 
-        let mut rng = rand::IsaacRng::new_seeded(&[42]);
+        let mut rng: rand::IsaacRng = rand::SeedableRng::from_seed(&[42]);
 
         do 3.times {
             do 90.times {