---

nikomatsakis · nikomatsakis · commit 5efcf02859d7 · 2012-07-13T10:20:51.000-07:00
yaml --- r: 22501 b: refs/heads/master c: 4c463b7 h: refs/heads/master i: 22499: 4cb8dc3 v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 9504778e2aec920b577a96eddb677d8c7207f1fb
+refs/heads/master: 4c463b78fbf0ff44834b966f1c589d211b718fe3
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
diff --git a/trunk/src/test/compile-fail/regions-creating-enums3.rs b/trunk/src/test/compile-fail/regions-creating-enums3.rs
@@ -4,7 +4,7 @@ enum ast {
 }
 
 fn mk_add_bad1(x: &a/ast, y: &b/ast) -> ast/&a {
-    add(x, y) //~ ERROR mismatched types: expected `&a.ast/&a` but found `&b.ast/&b`
+    add(x, y) //~ ERROR mismatched types: expected `&a/ast/&a` but found `&b/ast/&b`
 }
 
 fn main() {

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ enum ast {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`fn mk_add_bad1(x: &a/ast, y: &b/ast) -> ast/&a {`
`7`		- add(x, y) //~ ERROR mismatched types: expected `&a.ast/&a` but found `&b.ast/&b`
	`7`	+ add(x, y) //~ ERROR mismatched types: expected `&a/ast/&a` but found `&b/ast/&b`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`fn main() {`