diff --git a/src/libstd/rand/mod.rs b/src/libstd/rand/mod.rs index ba5941bc0be..7ae7e8080af 100644 --- a/src/libstd/rand/mod.rs +++ b/src/libstd/rand/mod.rs @@ -99,10 +99,10 @@ //! let between = Range::new(-1f64, 1.); //! let mut rng = rand::thread_rng(); //! -//! let total = 1_000_000us; -//! let mut in_circle = 0us; +//! let total = 1_000_000; +//! let mut in_circle = 0; //! -//! for _ in range(0us, total) { +//! for _ in range(0, total) { //! let a = between.ind_sample(&mut rng); //! let b = between.ind_sample(&mut rng); //! if a*a + b*b <= 1. { @@ -176,18 +176,18 @@ //! } //! //! fn free_doors(blocked: &[uint]) -> Vec { -//! range(0us, 3).filter(|x| !blocked.contains(x)).collect() +//! range(0, 3).filter(|x| !blocked.contains(x)).collect() //! } //! //! fn main() { //! // The estimation will be more accurate with more simulations -//! let num_simulations = 10000us; +//! let num_simulations = 10000; //! //! let mut rng = rand::thread_rng(); -//! let random_door = Range::new(0us, 3); +//! let random_door = Range::new(0, 3); //! -//! let (mut switch_wins, mut switch_losses) = (0us, 0us); -//! let (mut keep_wins, mut keep_losses) = (0us, 0us); +//! let (mut switch_wins, mut switch_losses) = (0, 0); +//! let (mut keep_wins, mut keep_losses) = (0, 0); //! //! println!("Running {} simulations...", num_simulations); //! for _ in range(0, num_simulations) { @@ -480,18 +480,18 @@ mod test { #[test] fn test_gen_range() { let mut r = thread_rng(); - for _ in range(0us, 1000) { + for _ in range(0, 1000) { let a = r.gen_range(-3i, 42); assert!(a >= -3 && a < 42); assert_eq!(r.gen_range(0i, 1), 0); assert_eq!(r.gen_range(-12i, -11), -12); } - for _ in range(0us, 1000) { + for _ in range(0, 1000) { let a = r.gen_range(10i, 42); assert!(a >= 10 && a < 42); assert_eq!(r.gen_range(0i, 1), 0); - assert_eq!(r.gen_range(3_000_000us, 3_000_001), 3_000_000); + assert_eq!(r.gen_range(3_000_000, 3_000_001), 3_000_000); } } @@ -521,24 +521,24 @@ mod test { #[test] fn test_gen_weighted_bool() { let mut r = thread_rng(); - assert_eq!(r.gen_weighted_bool(0us), true); - assert_eq!(r.gen_weighted_bool(1us), true); + assert_eq!(r.gen_weighted_bool(0), true); + assert_eq!(r.gen_weighted_bool(1), true); } #[test] fn test_gen_ascii_str() { let mut r = thread_rng(); - assert_eq!(r.gen_ascii_chars().take(0).count(), 0us); - assert_eq!(r.gen_ascii_chars().take(10).count(), 10us); - assert_eq!(r.gen_ascii_chars().take(16).count(), 16us); + assert_eq!(r.gen_ascii_chars().take(0).count(), 0); + assert_eq!(r.gen_ascii_chars().take(10).count(), 10); + assert_eq!(r.gen_ascii_chars().take(16).count(), 16); } #[test] fn test_gen_vec() { let mut r = thread_rng(); - assert_eq!(r.gen_iter::().take(0).count(), 0us); - assert_eq!(r.gen_iter::().take(10).count(), 10us); - assert_eq!(r.gen_iter::().take(16).count(), 16us); + assert_eq!(r.gen_iter::().take(0).count(), 0); + assert_eq!(r.gen_iter::().take(10).count(), 10); + assert_eq!(r.gen_iter::().take(16).count(), 16); } #[test] @@ -578,7 +578,7 @@ mod test { r.shuffle(&mut v); let b: &[_] = &[1, 1, 1]; assert_eq!(v, b); - assert_eq!(r.gen_range(0us, 1us), 0us); + assert_eq!(r.gen_range(0, 1), 0); } #[test] diff --git a/src/libstd/rand/os.rs b/src/libstd/rand/os.rs index 1c6a8b55527..043922fc60a 100644 --- a/src/libstd/rand/os.rs +++ b/src/libstd/rand/os.rs @@ -49,7 +49,7 @@ mod imp { const NR_GETRANDOM: libc::c_long = 384; unsafe { - syscall(NR_GETRANDOM, buf.as_mut_ptr(), buf.len(), 0us) + syscall(NR_GETRANDOM, buf.as_mut_ptr(), buf.len(), 0) } } @@ -378,7 +378,7 @@ mod test { fn test_os_rng_tasks() { let mut txs = vec!(); - for _ in range(0us, 20) { + for _ in range(0, 20) { let (tx, rx) = channel(); txs.push(tx); @@ -392,7 +392,7 @@ mod test { Thread::yield_now(); let mut v = [0u8; 1000]; - for _ in range(0us, 100) { + for _ in range(0, 100) { r.next_u32(); Thread::yield_now(); r.next_u64();