---

yaml
---
r: 171848
b: refs/heads/beta
c: a55011e
h: refs/heads/master
v: v3

Author: Jorge Aparicio

[refs]

@@ -31,5 +31,5 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
 refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
 refs/heads/batch: b5571ed71a5879c0495a982506258d5d267744ed
 refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
-refs/heads/beta: ec11f66dbf68c7d0a958b28e520f547c885a3fde
+refs/heads/beta: a55011e788e3523cc37c1fca47fc334a74682369
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928

branches/beta/src/test/compile-fail/unboxed-closures-type-mismatch.rs

@@ -14,6 +14,6 @@ use std::ops::FnMut;
 
 pub fn main() {
     let mut f = |&mut: x: int, y: int| -> int { x + y };
-    let z = f(1u, 2);    //~ ERROR type mismatch
+    let z = f(1u, 2);    //~ ERROR mismatched types
     println!("{}", z);
 }

branches/beta/src/test/run-pass/overloaded-calls-object-zero-args.rs

@@ -11,11 +11,11 @@
 // Tests calls to closure arguments where the closure takes 0 arguments.
 // This is a bit tricky due to rust-call ABI.
 
-fn foo(f: &mut FnMut()) -> int {
+fn foo(f: &mut FnMut() -> int) -> int {
     f()
 }
 
 fn main() {
-    let z = foo(|| 22);
+    let z = foo(&mut || 22);
     assert_eq!(z, 22);
 }