---

yaml
---
r: 29775
b: refs/heads/incoming
c: 6e31183
h: refs/heads/master
i:
  29773: 8654b2a
  29771: 3f955f4
  29767: 45a057b
  29759: 8f32114
v: v3

Author: pcwalton

[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: 87f4c153110743844e4b3a4bb9dcde31a5ef3eb4
+refs/heads/incoming: 6e311836140f86582501550da249c1df70427ab4
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/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&()))`
 }

branches/incoming/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() {

branches/incoming/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() {
 }
 

branches/incoming/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)`
 }

branches/incoming/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`
 }

branches/incoming/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})`
 }

branches/incoming/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?
 }

branches/incoming/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() {
-}
+}