---

yaml
---
r: 23175
b: refs/heads/master
c: 6e31183
h: refs/heads/master
i:
  23173: b14c090
  23171: 906faed
  23167: 9bc134b
v: v3

Author: pcwalton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 87f4c153110743844e4b3a4bb9dcde31a5ef3eb4
+refs/heads/master: 6e311836140f86582501550da249c1df70427ab4
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/test/compile-fail/block-coerce-no-2.rs

@@ -9,5 +9,5 @@ fn main() {
     }
 
     f(g);
-    //~^ ERROR mismatched types: expected `extern fn(extern fn(extern fn()))`
+    //~^ ERROR mismatched types: expected `fn(fn(fn&()))`
 }

trunk/src/test/compile-fail/block-coerce-no.rs

@@ -6,7 +6,7 @@ fn coerce(b: fn()) -> extern fn() {
            g: fn()) -> extern fn() { return f(g); }
     fn fn_id(f: extern fn()) -> extern fn() { return f }
     return lol(fn_id, b);
-    //~^ ERROR mismatched types: expected `extern fn(fn&()) -> extern fn()`
+    //~^ ERROR mismatched types: expected `fn(fn&()) -> fn()`
 }
 
 fn main() {

trunk/src/test/compile-fail/extern-wrong-value-type.rs

@@ -1,4 +1,4 @@
-// error-pattern:expected `fn&()` but found `*u8`
+// error-pattern:expected `fn&<R0>()` but found `*u8`
 extern fn f() {
 }
 

trunk/src/test/compile-fail/fn-compare-mismatch.rs

@@ -2,5 +2,5 @@ fn main() {
     fn f() { }
     fn g(i: int) { }
     let x = f == g;
-    //~^ ERROR expected `extern fn()` but found `extern fn(int)`
+    //~^ ERROR expected `fn()` but found `fn(int)`
 }

trunk/src/test/compile-fail/main-wrong-type-2.rs

@@ -1,3 +1,3 @@
 fn main() -> char {
-//~^ ERROR Wrong type in main function: found `extern fn() -> char`
+//~^ ERROR Wrong type in main function: found `fn() -> char`
 }

trunk/src/test/compile-fail/main-wrong-type.rs

@@ -1,3 +1,3 @@
 fn main(foo: {x: int, y: int}) {
-//~^ ERROR Wrong type in main function: found `extern fn({x: int,y: int})`
+//~^ ERROR Wrong type in main function: found `fn({x: int,y: int})`
 }

trunk/src/test/compile-fail/missing-do.rs

@@ -4,6 +4,6 @@ fn foo(f: fn()) { f() }
 
 fn main() {
     ~"" || 42; //~ ERROR binary operation || cannot be applied to type `~str`
-    foo || {}; //~ ERROR binary operation || cannot be applied to type `extern fn(fn&())`
+    foo || {}; //~ ERROR binary operation || cannot be applied to type `fn(fn&())`
     //~^ NOTE did you forget the 'do' keyword for the call?
 }

trunk/src/test/compile-fail/pure-subtyping.rs

@@ -23,14 +23,14 @@ fn assign_to_pure2(x: pure fn@(), y: fn@(), z: unsafe fn@()) {
     let b: pure fn() = y; //~ ERROR expected pure fn but found impure fn
     let c: pure fn() = z; //~ ERROR expected pure fn but found unsafe fn
 
-    let a: pure fn~() = x; //~ ERROR closure protocol mismatch (fn~ vs fn@)
-    let b: pure fn~() = y; //~ ERROR closure protocol mismatch (fn~ vs fn@)
-    let c: pure fn~() = z; //~ ERROR closure protocol mismatch (fn~ vs fn@)
+    let a: pure fn~() = x; //~ ERROR fn storage differs: expected ~ but found @
+    let b: pure fn~() = y; //~ ERROR fn storage differs: expected ~ but found @
+    let c: pure fn~() = z; //~ ERROR fn storage differs: expected ~ but found @
 
-    let a: unsafe fn~() = x; //~ ERROR closure protocol mismatch (fn~ vs fn@)
-    let b: unsafe fn~() = y; //~ ERROR closure protocol mismatch (fn~ vs fn@)
-    let c: unsafe fn~() = z; //~ ERROR closure protocol mismatch (fn~ vs fn@)
+    let a: unsafe fn~() = x; //~ ERROR fn storage differs: expected ~ but found @
+    let b: unsafe fn~() = y; //~ ERROR fn storage differs: expected ~ but found @
+    let c: unsafe fn~() = z; //~ ERROR fn storage differs: expected ~ but found @
 }
 
 fn main() {
-}
+}