---

yaml
---
r: 13545
b: refs/heads/master
c: 85977ce
h: refs/heads/master
i:
  13543: 274377b
v: v3

Author: lkuper

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 567e4d9c6fa638c7423877547e08a1311f642861
+refs/heads/master: 85977ced3f6796e9e6de25140ec0af14938a7e87
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/test/compile-fail/bad-const-type.rs

@@ -1,4 +1,4 @@
 // error-pattern:expected `str` but found `int`
 
-const i: str = 10;
+const i: str = 10i;
 fn main() { log(debug, i); }

trunk/src/test/compile-fail/bang-tailexpr.rs

@@ -1,4 +1,4 @@
 fn f() -> ! {
-    3 //! ERROR expected `_|_` but found `int`
+    3i //! ERROR expected `_|_` but found `int`
 }
 fn main() { }

trunk/src/test/compile-fail/if-branch-types.rs

@@ -1,3 +1,3 @@
 // error-pattern:mismatched types
 
-fn main() { let x = if true { 10 } else { 10u }; }
+fn main() { let x = if true { 10i } else { 10u }; }

trunk/src/test/compile-fail/issue-1362.rs

@@ -1,7 +1,7 @@
 // Regression test for issue #1362 - without that fix the span will be bogus
 // no-reformat
 fn main() {
-  let x: uint = 20; //! ERROR mismatched types
+  let x: uint = 20i; //! ERROR mismatched types
 }
 // NOTE: Do not add any extra lines as the line number the error is
 // on is significant; an error later in the source file might not

trunk/src/test/compile-fail/issue-1448-2.rs

@@ -1,5 +1,5 @@
 // Regresion test for issue #1448 and #1386
 
 fn main() {
-    #debug["%u", 10]; //! ERROR mismatched types
+    #debug["%u", 10i]; //! ERROR mismatched types
 }

trunk/src/test/compile-fail/issue-897-2.rs

@@ -1,6 +1,6 @@
 fn g() -> ! { fail; }
 fn f() -> ! {
-    ret 42; //! ERROR expected `_|_` but found `int`
+    ret 42i; //! ERROR expected `_|_` but found `int`
     g(); //! WARNING unreachable statement
 }
 fn main() { }

trunk/src/test/compile-fail/loop-does-not-diverge.rs

@@ -4,7 +4,7 @@ fn forever() -> ! {
   loop {
     break;
   }
-  ret 42; //! ERROR expected `_|_` but found `int`
+  ret 42i; //! ERROR expected `_|_` but found `int`
 }
 
 fn main() {

trunk/src/test/compile-fail/rec-extend.rs

@@ -2,7 +2,7 @@
 
 fn main() {
 
-    let a = {foo: 0};
+    let a = {foo: 0i};
 
     let b = {foo: true with a};
 }

trunk/src/test/compile-fail/regions-scoping.rs

@@ -30,7 +30,7 @@ fn nested(x: &x.int) {  // (1)
         let b: &x.int = foo(x, a) { |_x, _y, z| z };
         let c: &x.int = foo(a, a) { |_x, _y, z| z };
 
-        let z = 3;
+        let z = 3i;
         let d: &x.int = foo(x, x) { |_x, _y, z| z };
         let e: &x.int = foo(x, &z) { |_x, _y, z| z };
         let f: &x.int = foo(&z, &z) { |_x, _y, z| z }; //! ERROR mismatched types: expected `&x.int` but found

trunk/src/test/compile-fail/type-mismatch-multiple.rs

@@ -2,4 +2,4 @@
 // error-pattern:mismatched types: expected `bool`
 // error-pattern:mismatched types: expected `int`
 
-fn main() { let a: bool = 1; let b: int = true; }
+fn main() { let a: bool = 1i; let b: int = true; }

trunk/src/test/compile-fail/vec-field.rs

@@ -2,7 +2,7 @@
 // issue #367
 
 fn f() {
-    let v = [1];
+    let v = [1i];
     log(debug, v.some_field_name); //type error
 }