---

yaml
---
r: 170754
b: refs/heads/try
c: a55011e
h: refs/heads/master
v: v3

Author: Jorge Aparicio

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 73a25f55ad748b4d3516417c711b99ce446591af
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 5b3cd3900ceda838f5798c30ab96ceb41f962534
-refs/heads/try: ec11f66dbf68c7d0a958b28e520f547c885a3fde
+refs/heads/try: a55011e788e3523cc37c1fca47fc334a74682369
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/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/try/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);
 }