Skip to content

Commit 6462720

Browse files
committed
---
yaml --- r: 36277 b: refs/heads/try2 c: 8336cad h: refs/heads/master i: 36275: 038ff73 v: v3
1 parent cfbe945 commit 6462720

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
55
refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 234df9cae0a1c677db0375cf1327555c3bdb78db
8+
refs/heads/try2: 8336cad95deb79a3c3b3ad5b5496a314711d175e
99
refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
1010
refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/test/compile-fail/issue-1896-2.rs renamed to branches/try2/src/test/run-pass/fn-assign-managed-to-bare-1.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ fn add(n: int) -> fn@(int) -> int {
55
fn main()
66
{
77
assert add(3)(4) == 7;
8-
let add3 : fn(int)->int = add(3); //~ ERROR mismatched types
8+
let add3 : fn(int)->int = add(3);
99
assert add3(4) == 7;
1010
}

branches/try2/src/test/compile-fail/issue-1896-3.rs renamed to branches/try2/src/test/run-pass/fn-assign-managed-to-bare-2.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ fn main()
1212
let add2 : &(fn@(int)->int) = &add(2);
1313
assert (*add2)(5) == 7;
1414

15-
let add3 : fn(int)->int = add(3); //~ ERROR mismatched types
15+
let add3 : fn(int)->int = add(3);
1616
assert add3(4) == 7;
1717
}

0 commit comments

Comments
 (0)