rollup merge of #21631: tbu-/isize_police

Conflicts:
	src/libcoretest/iter.rs

3 files changed, 14 insertions, 14 deletions

diff --git a/src/test/bench/core-std.rs b/src/test/bench/core-std.rs
index 6d12d84f652..388868eee70 100644
--- a/src/test/bench/core-std.rs
+++ b/src/test/bench/core-std.rs
@@ -62,7 +62,7 @@ fn maybe_run_test<F>(argv: &[String], name: String, test: F) where F: FnOnce() {
 }
 
 fn shift_push() {
-    let mut v1 = repeat(1i).take(30000).collect::<Vec<_>>();
+    let mut v1 = repeat(1).take(30000).collect::<Vec<_>>();
     let mut v2 = Vec::new();
 
     while v1.len() > 0 {
diff --git a/src/test/bench/shootout-meteor.rs b/src/test/bench/shootout-meteor.rs
index e6ef58cba35..11c471c40c5 100644
--- a/src/test/bench/shootout-meteor.rs
+++ b/src/test/bench/shootout-meteor.rs
@@ -150,16 +150,16 @@ fn mask(dy: int, dx: int, id: uint, p: &Vec<(int, int)>) -> Option<u64> {
 // (i/5, i%5).
 fn make_masks() -> Vec<Vec<Vec<u64> > > {
     let pieces = vec!(
-        vec!((0i,0i),(0,1),(0,2),(0,3),(1,3)),
-        vec!((0i,0i),(0,2),(0,3),(1,0),(1,1)),
-        vec!((0i,0i),(0,1),(0,2),(1,2),(2,1)),
-        vec!((0i,0i),(0,1),(0,2),(1,1),(2,1)),
-        vec!((0i,0i),(0,2),(1,0),(1,1),(2,1)),
-        vec!((0i,0i),(0,1),(0,2),(1,1),(1,2)),
-        vec!((0i,0i),(0,1),(1,1),(1,2),(2,1)),
-        vec!((0i,0i),(0,1),(0,2),(1,0),(1,2)),
-        vec!((0i,0i),(0,1),(0,2),(1,2),(1,3)),
-        vec!((0i,0i),(0,1),(0,2),(0,3),(1,2)));
+        vec!((0,0),(0,1),(0,2),(0,3),(1,3)),
+        vec!((0,0),(0,2),(0,3),(1,0),(1,1)),
+        vec!((0,0),(0,1),(0,2),(1,2),(2,1)),
+        vec!((0,0),(0,1),(0,2),(1,1),(2,1)),
+        vec!((0,0),(0,2),(1,0),(1,1),(2,1)),
+        vec!((0,0),(0,1),(0,2),(1,1),(1,2)),
+        vec!((0,0),(0,1),(1,1),(1,2),(2,1)),
+        vec!((0,0),(0,1),(0,2),(1,0),(1,2)),
+        vec!((0,0),(0,1),(0,2),(1,2),(1,3)),
+        vec!((0,0),(0,1),(0,2),(0,3),(1,2)));
 
     // To break the central symmetry of the problem, every
     // transformation must be taken except for one piece (piece 3
@@ -169,7 +169,7 @@ fn make_masks() -> Vec<Vec<Vec<u64> > > {
         .map(|(id, p)| transform(p, id != 3))
         .collect();
 
-    (0i..50).map(|yx| {
+    (0..50).map(|yx| {
         transforms.iter().enumerate().map(|(id, t)| {
             t.iter().filter_map(|p| mask(yx / 5, yx % 5, id, p)).collect()
         }).collect()
diff --git a/src/test/bench/shootout-pfib.rs b/src/test/bench/shootout-pfib.rs
index 2f68262b608..dd3ae1699a9 100644
--- a/src/test/bench/shootout-pfib.rs
+++ b/src/test/bench/shootout-pfib.rs
@@ -66,9 +66,9 @@ fn parse_opts(argv: Vec<String> ) -> Config {
 }
 
 fn stress_task(id: int) {
-    let mut i = 0i;
+    let mut i = 0;
     loop {
-        let n = 15i;
+        let n = 15;
         assert_eq!(fib(n), fib(n));
         i += 1;
         println!("{}: Completed {} iterations", id, i);