Skip to content

Commit 8efbb63

Browse files
author
Jorge Aparicio
committed
---
yaml --- r: 168874 b: refs/heads/snap-stage3 c: a55011e h: refs/heads/master v: v3
1 parent e2f2b38 commit 8efbb63

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 5e21e17d9638d14af41e27e5ca9a21c8a1bc0170
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: ec11f66dbf68c7d0a958b28e520f547c885a3fde
4+
refs/heads/snap-stage3: a55011e788e3523cc37c1fca47fc334a74682369
55
refs/heads/try: 5204084bd2e46af7cc6e0147430e44dd0d657bbb
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ use std::ops::FnMut;
1414

1515
pub fn main() {
1616
let mut f = |&mut: x: int, y: int| -> int { x + y };
17-
let z = f(1u, 2); //~ ERROR type mismatch
17+
let z = f(1u, 2); //~ ERROR mismatched types
1818
println!("{}", z);
1919
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
// Tests calls to closure arguments where the closure takes 0 arguments.
1212
// This is a bit tricky due to rust-call ABI.
1313

14-
fn foo(f: &mut FnMut()) -> int {
14+
fn foo(f: &mut FnMut() -> int) -> int {
1515
f()
1616
}
1717

1818
fn main() {
19-
let z = foo(|| 22);
19+
let z = foo(&mut || 22);
2020
assert_eq!(z, 22);
2121
}

0 commit comments

Comments
 (0)