---

pcwalton · pcwalton · commit f8f296450f21 · 2012-08-13T17:13:48.000-07:00
yaml --- r: 27761 b: refs/heads/try c: 36d8682 h: refs/heads/master i: 27759: be3d7a2 v: v3
diff --git a/[refs] b/[refs]
@@ -2,7 +2,7 @@
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
-refs/heads/try: 9b5266d745ec69e625c2be2defd36d59080caf34
+refs/heads/try: 36d8682269fb29a10da93634cff4a9320c45a2f4
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
diff --git a/branches/try/src/test/compile-fail/block-coerce-no-2.rs b/branches/try/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`	`}`