---

pcwalton · pcwalton · commit 348b19c5356b · 2012-08-13T17:13:48.000-07:00
yaml --- r: 23183 b: refs/heads/master c: 36d8682 h: refs/heads/master i: 23181: 3d9dc9f 23179: ff3f136 23175: 1f58cd5 23167: 9bc134b v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 9b5266d745ec69e625c2be2defd36d59080caf34
+refs/heads/master: 36d8682269fb29a10da93634cff4a9320c45a2f4
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
diff --git a/trunk/src/test/compile-fail/block-coerce-no-2.rs b/trunk/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`	`}`