Skip to content

Commit 11554ef

Browse files
committed
test: Fix tests. rs=tests
1 parent 0ea37b5 commit 11554ef

File tree

8 files changed

+32
-32
lines changed

8 files changed

+32
-32
lines changed

src/libcore/dlist.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ impl<T> BaseIter<T> for @mut DList<T> {
507507
* allow for e.g. breadth-first search with in-place enqueues), but
508508
* removing the current node is forbidden.
509509
*/
510-
pure fn each(&self, f: fn(v: &T) -> bool) {
510+
pure fn each(&self, f: &fn(v: &T) -> bool) {
511511
let mut link = self.peek_n();
512512
while option::is_some(&link) {
513513
let nobe = option::get(link);

src/test/auxiliary/issue_2472_b.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
// except according to those terms.
1010

1111

12-
struct S(())
12+
pub struct S(());
1313

1414
pub impl S {
1515
fn foo() { }
1616
}
1717

18-
trait T {
18+
pub trait T {
1919
fn bar();
2020
}
2121

src/test/compile-fail/block-coerce-no-2.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ fn main() {
1515
fn f(f: extern fn(extern fn(extern fn()))) {
1616
}
1717

18-
fn g(f: extern fn(fn())) {
18+
fn g(f: extern fn(&fn())) {
1919
}
2020

2121
f(g);

src/test/compile-fail/borrowck-assign-to-enum.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ struct foo(int);
1212

1313
fn main() {
1414
let x = foo(3);
15-
*x = 4; //~ ERROR assigning to enum content
15+
*x = 4; //~ ERROR assigning to anonymous field
1616
}

src/test/compile-fail/borrowck-unary-move-2.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ struct wrapper(noncopyable);
2828

2929
fn main() {
3030
let x1 = wrapper(noncopyable());
31-
let _x2 = *x1; //~ ERROR moving out of enum content
31+
let _x2 = *x1; //~ ERROR moving out of anonymous field
3232
}

src/test/compile-fail/issue-2063.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// test that autoderef of a type like this does not
1212
// cause compiler to loop. Note that no instances
1313
// of such a type could ever be constructed.
14-
enum t(@t); //~ ERROR this type cannot be instantiated
14+
struct t(@t); //~ ERROR this type cannot be instantiated
1515

1616
trait to_str_2 {
1717
fn to_str() -> ~str;

src/test/compile-fail/regions-fn-subtyping.rs

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,41 +17,41 @@ fn test_fn<T>(_x: &x/T, _y: &y/T, _z: &z/T) {
1717
// subtype::<T1>(of::<T2>()) will typecheck
1818
// iff T1 <: T2.
1919

20-
subtype::<fn(&a/T)>(
21-
of::<fn(&a/T)>());
20+
subtype::<&fn(&a/T)>(
21+
of::<&fn(&a/T)>());
2222

23-
subtype::<fn(&a/T)>(
24-
of::<fn(&b/T)>());
23+
subtype::<&fn(&a/T)>(
24+
of::<&fn(&b/T)>());
2525

26-
subtype::<fn(&b/T)>(
27-
of::<fn(&x/T)>());
26+
subtype::<&fn(&b/T)>(
27+
of::<&fn(&x/T)>());
2828

29-
subtype::<fn(&x/T)>(
30-
of::<fn(&b/T)>()); //~ ERROR mismatched types
29+
subtype::<&fn(&x/T)>(
30+
of::<&fn(&b/T)>()); //~ ERROR mismatched types
3131

32-
subtype::<fn(&a/T, &b/T)>(
33-
of::<fn(&a/T, &a/T)>());
32+
subtype::<&fn(&a/T, &b/T)>(
33+
of::<&fn(&a/T, &a/T)>());
3434

35-
subtype::<fn(&a/T, &a/T)>(
36-
of::<fn(&a/T, &b/T)>()); //~ ERROR mismatched types
35+
subtype::<&fn(&a/T, &a/T)>(
36+
of::<&fn(&a/T, &b/T)>()); //~ ERROR mismatched types
3737

38-
subtype::<fn(&a/T, &b/T)>(
39-
of::<fn(&x/T, &y/T)>());
38+
subtype::<&fn(&a/T, &b/T)>(
39+
of::<&fn(&x/T, &y/T)>());
4040

41-
subtype::<fn(&x/T, &y/T)>(
42-
of::<fn(&a/T, &b/T)>()); //~ ERROR mismatched types
41+
subtype::<&fn(&x/T, &y/T)>(
42+
of::<&fn(&a/T, &b/T)>()); //~ ERROR mismatched types
4343

44-
subtype::<fn(&x/T) -> @fn(&a/T)>(
45-
of::<fn(&x/T) -> @fn(&a/T)>());
44+
subtype::<&fn(&x/T) -> @fn(&a/T)>(
45+
of::<&fn(&x/T) -> @fn(&a/T)>());
4646

47-
subtype::<fn(&a/T) -> @fn(&a/T)>(
48-
of::<fn(&a/T) -> @fn(&b/T)>()); //~ ERROR mismatched types
47+
subtype::<&fn(&a/T) -> @fn(&a/T)>(
48+
of::<&fn(&a/T) -> @fn(&b/T)>()); //~ ERROR mismatched types
4949

50-
subtype::<fn(&a/T) -> @fn(&a/T)>(
51-
of::<fn(&x/T) -> @fn(&b/T)>()); //~ ERROR mismatched types
50+
subtype::<&fn(&a/T) -> @fn(&a/T)>(
51+
of::<&fn(&x/T) -> @fn(&b/T)>()); //~ ERROR mismatched types
5252

53-
subtype::<fn(&a/T) -> @fn(&b/T)>(
54-
of::<fn(&a/T) -> @fn(&a/T)>());
53+
subtype::<&fn(&a/T) -> @fn(&b/T)>(
54+
of::<&fn(&a/T) -> @fn(&a/T)>());
5555
}
5656

5757
fn main() {}

src/test/run-pass/issue-1458.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ fn plus_one(f: &fn() -> int) -> int {
1212
return f() + 1;
1313
}
1414

15-
fn ret_plus_one() -> extern fn(fn() -> int) -> int {
15+
fn ret_plus_one() -> extern fn(&fn() -> int) -> int {
1616
return plus_one;
1717
}
1818

0 commit comments

Comments
 (0)