---

pcwalton · pcwalton · commit 643fd5722238 · 2012-08-13T17:13:48.000-07:00
yaml --- r: 29783 b: refs/heads/incoming c: 36d8682 h: refs/heads/master i: 29781: 2a1d49a 29779: 438e49c 29775: ed806e9 v: v3
diff --git a/[refs] b/[refs]
@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 9b5266d745ec69e625c2be2defd36d59080caf34
+refs/heads/incoming: 36d8682269fb29a10da93634cff4a9320c45a2f4
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/incoming/src/test/compile-fail/block-coerce-no-2.rs b/branches/incoming/src/test/compile-fail/block-coerce-no-2.rs
@@ -9,5 +9,5 @@ fn main() {
     }
 
     f(g);
-    //~^ ERROR mismatched types: expected `fn(fn(fn&()))`
+    //~^ ERROR mismatched types: expected `fn(fn(fn()))`
 }

Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,5 @@ fn main() {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`f(g);`
`12`		- //~^ ERROR mismatched types: expected `fn(fn(fn&()))`
	`12`	+ //~^ ERROR mismatched types: expected `fn(fn(fn()))`
`13`	`13`	`}`