Remove `i`, `is`, `u`, or `us` suffixes that are not necessary.

4 files changed, 22 insertions, 22 deletions

diff --git a/src/libstd/sync/mpsc/mod.rs b/src/libstd/sync/mpsc/mod.rs
index 410d3c0ecd5..21993e51669 100644
--- a/src/libstd/sync/mpsc/mod.rs
+++ b/src/libstd/sync/mpsc/mod.rs
@@ -1147,9 +1147,9 @@ mod test {
     fn stress() {
         let (tx, rx) = channel::<int>();
         let t = thread::spawn(move|| {
-            for _ in 0u..10000 { tx.send(1).unwrap(); }
+            for _ in 0..10000 { tx.send(1).unwrap(); }
         });
-        for _ in 0u..10000 {
+        for _ in 0..10000 {
             assert_eq!(rx.recv().unwrap(), 1);
         }
         t.join().ok().unwrap();
@@ -1209,7 +1209,7 @@ mod test {
                 assert_eq!(rx.recv().unwrap(), 1);
             }
         });
-        for _ in 0u..40 {
+        for _ in 0..40 {
             tx.send(1).unwrap();
         }
         t.join().ok().unwrap();
@@ -1530,7 +1530,7 @@ mod test {
             tx2.send(()).unwrap();
         });
         // make sure the other task has gone to sleep
-        for _ in 0u..5000 { thread::yield_now(); }
+        for _ in 0..5000 { thread::yield_now(); }
 
         // upgrade to a shared chan and send a message
         let t = tx.clone();
@@ -1654,9 +1654,9 @@ mod sync_tests {
     fn stress() {
         let (tx, rx) = sync_channel::<int>(0);
         thread::spawn(move|| {
-            for _ in 0u..10000 { tx.send(1).unwrap(); }
+            for _ in 0..10000 { tx.send(1).unwrap(); }
         });
-        for _ in 0u..10000 {
+        for _ in 0..10000 {
             assert_eq!(rx.recv().unwrap(), 1);
         }
     }
@@ -1893,8 +1893,8 @@ mod sync_tests {
     fn recv_a_lot() {
         // Regression test that we don't run out of stack in scheduler context
         let (tx, rx) = sync_channel(10000);
-        for _ in 0u..10000 { tx.send(()).unwrap(); }
-        for _ in 0u..10000 { rx.recv().unwrap(); }
+        for _ in 0..10000 { tx.send(()).unwrap(); }
+        for _ in 0..10000 { rx.recv().unwrap(); }
     }
 
     #[test]
@@ -1994,7 +1994,7 @@ mod sync_tests {
             tx2.send(()).unwrap();
         });
         // make sure the other task has gone to sleep
-        for _ in 0u..5000 { thread::yield_now(); }
+        for _ in 0..5000 { thread::yield_now(); }
 
         // upgrade to a shared chan and send a message
         let t = tx.clone();
@@ -2082,7 +2082,7 @@ mod sync_tests {
             rx2.recv().unwrap();
         }
 
-        for _ in 0u..100 {
+        for _ in 0..100 {
             repro()
         }
     }
diff --git a/src/libstd/sync/mpsc/mpsc_queue.rs b/src/libstd/sync/mpsc/mpsc_queue.rs
index 0a4ff8769ab..a2accb128c3 100644
--- a/src/libstd/sync/mpsc/mpsc_queue.rs
+++ b/src/libstd/sync/mpsc/mpsc_queue.rs
@@ -171,8 +171,8 @@ mod tests {
 
     #[test]
     fn test() {
-        let nthreads = 8u;
-        let nmsgs = 1000u;
+        let nthreads = 8;
+        let nmsgs = 1000;
         let q = Queue::new();
         match q.pop() {
             Empty => {}
@@ -192,7 +192,7 @@ mod tests {
             });
         }
 
-        let mut i = 0u;
+        let mut i = 0;
         while i < nthreads * nmsgs {
             match q.pop() {
                 Empty | Inconsistent => {},
diff --git a/src/libstd/sync/mpsc/select.rs b/src/libstd/sync/mpsc/select.rs
index 4756ef612f9..8fcedd2ab57 100644
--- a/src/libstd/sync/mpsc/select.rs
+++ b/src/libstd/sync/mpsc/select.rs
@@ -428,10 +428,10 @@ mod test {
         let (tx3, rx3) = channel::<int>();
 
         let _t = thread::spawn(move|| {
-            for _ in 0u..20 { thread::yield_now(); }
+            for _ in 0..20 { thread::yield_now(); }
             tx1.send(1).unwrap();
             rx3.recv().unwrap();
-            for _ in 0u..20 { thread::yield_now(); }
+            for _ in 0..20 { thread::yield_now(); }
         });
 
         select! {
@@ -452,7 +452,7 @@ mod test {
         let (tx3, rx3) = channel::<()>();
 
         let _t = thread::spawn(move|| {
-            for _ in 0u..20 { thread::yield_now(); }
+            for _ in 0..20 { thread::yield_now(); }
             tx1.send(1).unwrap();
             tx2.send(2).unwrap();
             rx3.recv().unwrap();
@@ -557,7 +557,7 @@ mod test {
             tx3.send(()).unwrap();
         });
 
-        for _ in 0u..1000 { thread::yield_now(); }
+        for _ in 0..1000 { thread::yield_now(); }
         drop(tx1.clone());
         tx2.send(()).unwrap();
         rx3.recv().unwrap();
@@ -670,7 +670,7 @@ mod test {
             tx2.send(()).unwrap();
         });
 
-        for _ in 0u..100 { thread::yield_now() }
+        for _ in 0..100 { thread::yield_now() }
         tx1.send(()).unwrap();
         rx2.recv().unwrap();
     }
@@ -690,7 +690,7 @@ mod test {
             tx2.send(()).unwrap();
         });
 
-        for _ in 0u..100 { thread::yield_now() }
+        for _ in 0..100 { thread::yield_now() }
         tx1.send(()).unwrap();
         rx2.recv().unwrap();
     }
@@ -709,7 +709,7 @@ mod test {
             tx2.send(()).unwrap();
         });
 
-        for _ in 0u..100 { thread::yield_now() }
+        for _ in 0..100 { thread::yield_now() }
         tx1.send(()).unwrap();
         rx2.recv().unwrap();
     }
@@ -727,7 +727,7 @@ mod test {
     fn sync2() {
         let (tx, rx) = sync_channel::<int>(0);
         let _t = thread::spawn(move|| {
-            for _ in 0u..100 { thread::yield_now() }
+            for _ in 0..100 { thread::yield_now() }
             tx.send(1).unwrap();
         });
         select! {
diff --git a/src/libstd/sync/mpsc/spsc_queue.rs b/src/libstd/sync/mpsc/spsc_queue.rs
index b8f835bde51..e1a89706509 100644
--- a/src/libstd/sync/mpsc/spsc_queue.rs
+++ b/src/libstd/sync/mpsc/spsc_queue.rs
@@ -325,7 +325,7 @@ mod test {
             let (tx, rx) = channel();
             let q2 = q.clone();
             let _t = thread::spawn(move|| {
-                for _ in 0u..100000 {
+                for _ in 0..100000 {
                     loop {
                         match q2.pop() {
                             Some(1) => break,