---

lkuper · lkuper · commit 1356ba89da89 · 2012-06-19T16:35:26.000-07:00
yaml --- r: 10584 b: refs/heads/snap-stage3 c: 8cc1149 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 636a849bf20105ba4c316c2cc44cca391cb11d84
+refs/heads/snap-stage3: 8cc1149130dab62a70e2eea5070d85bff07b1a03
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
diff --git a/branches/snap-stage3/src/test/compile-fail/fail-type-err.rs b/branches/snap-stage3/src/test/compile-fail/fail-type-err.rs
@@ -1,2 +1,2 @@
 // error-pattern:expected `str` but found `[int]`
-fn main() { fail [0]; }
+fn main() { fail [0i]; }
diff --git a/branches/snap-stage3/src/test/compile-fail/issue-897.rs b/branches/snap-stage3/src/test/compile-fail/issue-897.rs
@@ -1,5 +1,5 @@
 fn f() -> ! {
-    ret 42; //! ERROR expected `_|_` but found `int`
+    ret 42i; //! ERROR expected `_|_` but found `int`
     fail; //! WARNING unreachable statement
 }
 fn main() { }

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	// error-pattern:expected `str` but found `[int]`
`2`		`-fn main() { fail [0]; }`
	`2`	`+fn main() { fail [0i]; }`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`fn f() -> ! {`
`2`		- ret 42; //! ERROR expected `_\|_` but found `int`
	`2`	+ ret 42i; //! ERROR expected `_\|_` but found `int`
`3`	`3`	`fail; //! WARNING unreachable statement`
`4`	`4`	`}`
`5`	`5`	`fn main() { }`