---

nikomatsakis · nikomatsakis · commit 21e0d6297d6a · 2012-07-13T10:20:51.000-07:00
yaml --- r: 31163 b: refs/heads/dist-snap c: 4c463b7 h: refs/heads/master i: 31161: 71ee5b5 31159: 972cea4 v: v3
diff --git a/[refs] b/[refs]
@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: 9504778e2aec920b577a96eddb677d8c7207f1fb
+refs/heads/dist-snap: 4c463b78fbf0ff44834b966f1c589d211b718fe3
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/dist-snap/src/test/compile-fail/regions-creating-enums3.rs b/branches/dist-snap/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() {`