rollup merge of #21631: tbu-/isize_police

Conflicts:
	src/libcoretest/iter.rs

9 files changed, 37 insertions, 37 deletions

diff --git a/src/test/pretty/block-disambig.rs b/src/test/pretty/block-disambig.rs
index 1e286c236a5..c9cb72d8af7 100644
--- a/src/test/pretty/block-disambig.rs
+++ b/src/test/pretty/block-disambig.rs
@@ -15,9 +15,9 @@
 
 use std::cell::Cell;
 
-fn test1() { let val = &0i; { } *val; }
+fn test1() { let val = &0; { } *val; }
 
-fn test2() -> int { let val = &0i; { } *val }
+fn test2() -> int { let val = &0; { } *val }
 
 #[derive(Copy)]
 struct S { eax: int }
@@ -35,13 +35,13 @@ fn test5() -> (int, int) { { } (0, 1) }
 fn test6() -> bool { { } (true || false) && true }
 
 fn test7() -> uint {
-    let regs = &0i;
+    let regs = &0;
     match true { true => { } _ => { } }
     (*regs < 2) as uint
 }
 
 fn test8() -> int {
-    let val = &0i;
+    let val = &0;
     match true {
         true => { }
         _    => { }
@@ -54,12 +54,12 @@ fn test8() -> int {
 }
 
 fn test9() {
-    let regs = &Cell::new(0i);
+    let regs = &Cell::new(0);
     match true { true => { } _ => { } } regs.set(regs.get() + 1);
 }
 
 fn test10() -> int {
-    let regs = vec!(0i);
+    let regs = vec!(0);
     match true { true => { } _ => { } }
     regs[0]
 }
diff --git a/src/test/pretty/issue-929.rs b/src/test/pretty/issue-929.rs
index 377f4669ffc..75a6b919342 100644
--- a/src/test/pretty/issue-929.rs
+++ b/src/test/pretty/issue-929.rs
@@ -8,6 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-fn f() { if (1i == panic!()) { } else { } }
+fn f() { if (1 == panic!()) { } else { } }
 
 fn main() { }
diff --git a/src/test/pretty/match-block-expr.rs b/src/test/pretty/match-block-expr.rs
index 44771a29bb4..7751f155da4 100644
--- a/src/test/pretty/match-block-expr.rs
+++ b/src/test/pretty/match-block-expr.rs
@@ -11,6 +11,6 @@
 // pp-exact
 
 fn main() {
-    let x = match { 5i } { 1 => 5i, 2 => 6, _ => 7, };
+    let x = match { 5 } { 1 => 5, 2 => 6, _ => 7, };
     assert_eq!(x , 7);
 }
diff --git a/src/test/pretty/match-naked-expr-medium.rs b/src/test/pretty/match-naked-expr-medium.rs
index d2f8157ef62..39af19dbf6f 100644
--- a/src/test/pretty/match-naked-expr-medium.rs
+++ b/src/test/pretty/match-naked-expr-medium.rs
@@ -11,7 +11,7 @@
 // pp-exact
 
 fn main() {
-    let x = Some(3i);
+    let x = Some(3);
     let _y =
         match x {
             Some(_) =>
diff --git a/src/test/pretty/match-naked-expr.rs b/src/test/pretty/match-naked-expr.rs
index 6b4f579f9c5..02bbf667d96 100644
--- a/src/test/pretty/match-naked-expr.rs
+++ b/src/test/pretty/match-naked-expr.rs
@@ -11,7 +11,7 @@
 // pp-exact
 
 fn main() {
-    let x = Some(3i);
+    let x = Some(3);
     let _y =
         match x {
             Some(_) => "some(_)".to_string(),
diff --git a/src/test/pretty/path-type-bounds.rs b/src/test/pretty/path-type-bounds.rs
index 382394b1407..e27a3365a41 100644
--- a/src/test/pretty/path-type-bounds.rs
+++ b/src/test/pretty/path-type-bounds.rs
@@ -19,6 +19,6 @@ fn foo<'a>(x: Box<Tr+ Sync + 'a>) -> Box<Tr+ Sync + 'a> { x }
 fn main() {
     let x: Box<Tr+ Sync>;
 
-    Box::new(1i) as Box<Tr+ Sync>;
+    Box::new(1) as Box<Tr+ Sync>;
 }
 
diff --git a/src/test/pretty/unary-op-disambig.rs b/src/test/pretty/unary-op-disambig.rs
index 850904fe53e..1592e010aaf 100644
--- a/src/test/pretty/unary-op-disambig.rs
+++ b/src/test/pretty/unary-op-disambig.rs
@@ -18,10 +18,10 @@ fn block_nosemi() -> int { ({ 0 }) - 1 }
 
 fn if_semi() -> int { if true { f() } else { f() }; -1 }
 
-fn if_nosemi() -> int { (if true { 0i } else { 0i }) - 1 }
+fn if_nosemi() -> int { (if true { 0 } else { 0 }) - 1 }
 
 fn alt_semi() -> int { match true { true => { f() } _ => { } }; -1 }
 
 fn alt_no_semi() -> int { (match true { true => { 0 } _ => { 1 } }) - 1 }
 
-fn stmt() { { f() }; -1i; }
+fn stmt() { { f() }; -1; }
diff --git a/src/test/pretty/vec-comments.pp b/src/test/pretty/vec-comments.pp
index 401c63efbc4..dc2dae1044d 100644
--- a/src/test/pretty/vec-comments.pp
+++ b/src/test/pretty/vec-comments.pp
@@ -15,25 +15,25 @@ fn main() {
     let _v1 =
         [
          // Comment
-         0i,
+         0,
          // Comment
-         1i,
+         1,
          // Comment
-         2i];
+         2];
     let _v2 =
-        [0i, // Comment
-         1i, // Comment
-         2i]; // Comment
+        [0, // Comment
+         1, // Comment
+         2]; // Comment
     let _v3 =
         [
          /* Comment */
-         0i,
+         0,
          /* Comment */
-         1i,
+         1,
          /* Comment */
-         2i];
+         2];
     let _v4 =
-        [0i, /* Comment */
-         1i, /* Comment */
-         2i]; /* Comment */
+        [0, /* Comment */
+         1, /* Comment */
+         2]; /* Comment */
 }
diff --git a/src/test/pretty/vec-comments.rs b/src/test/pretty/vec-comments.rs
index 401c63efbc4..dc2dae1044d 100644
--- a/src/test/pretty/vec-comments.rs
+++ b/src/test/pretty/vec-comments.rs
@@ -15,25 +15,25 @@ fn main() {
     let _v1 =
         [
          // Comment
-         0i,
+         0,
          // Comment
-         1i,
+         1,
          // Comment
-         2i];
+         2];
     let _v2 =
-        [0i, // Comment
-         1i, // Comment
-         2i]; // Comment
+        [0, // Comment
+         1, // Comment
+         2]; // Comment
     let _v3 =
         [
          /* Comment */
-         0i,
+         0,
          /* Comment */
-         1i,
+         1,
          /* Comment */
-         2i];
+         2];
     let _v4 =
-        [0i, /* Comment */
-         1i, /* Comment */
-         2i]; /* Comment */
+        [0, /* Comment */
+         1, /* Comment */
+         2]; /* Comment */
 }