diff --git a/src/test/run-pass/argument-passing.rs b/src/test/run-pass/argument-passing.rs index ba9266b8a30f2..89c86c1cf430f 100644 --- a/src/test/run-pass/argument-passing.rs +++ b/src/test/run-pass/argument-passing.rs @@ -9,11 +9,10 @@ // except according to those terms. // xfail-fast -#[legacy_modes]; struct X { mut x: int } -fn f1(a: X, b: &mut int, -c: int) -> int { +fn f1(a: &mut X, b: &mut int, -c: int) -> int { let r = a.x + *b + c; a.x = 0; *b = 10; @@ -24,7 +23,7 @@ fn f2(a: int, f: fn(int)) -> int { f(1); return a; } pub fn main() { let mut a = X {mut x: 1}, b = 2, c = 3; - assert (f1(a, &mut b, c) == 6); + assert (f1(&mut a, &mut b, c) == 6); assert (a.x == 0); assert (b == 10); assert (f2(a.x, |x| a.x = 50 ) == 0); diff --git a/src/test/run-pass/block-iter-1.rs b/src/test/run-pass/block-iter-1.rs index 6faf4129ba774..b23ce11226784 100644 --- a/src/test/run-pass/block-iter-1.rs +++ b/src/test/run-pass/block-iter-1.rs @@ -9,16 +9,15 @@ // except according to those terms. // xfail-fast -#[legacy_modes]; -fn iter_vec(v: ~[T], f: fn(T)) { for v.each |x| { f(*x); } } +fn iter_vec(v: ~[T], f: fn(&T)) { for v.each |x| { f(x); } } pub fn main() { let v = ~[1, 2, 3, 4, 5, 6, 7]; let mut odds = 0; iter_vec(v, |i| { log(error, i); - if i % 2 == 1 { + if *i % 2 == 1 { odds += 1; } log(error, odds); diff --git a/src/test/run-pass/block-iter-2.rs b/src/test/run-pass/block-iter-2.rs index d57346a329958..df49fc6a4ef5c 100644 --- a/src/test/run-pass/block-iter-2.rs +++ b/src/test/run-pass/block-iter-2.rs @@ -9,17 +9,16 @@ // except according to those terms. // xfail-fast -#[legacy_modes]; -fn iter_vec(v: ~[T], f: fn(T)) { for v.each |x| { f(*x); } } +fn iter_vec(v: ~[T], f: fn(&T)) { for v.each |x| { f(x); } } pub fn main() { let v = ~[1, 2, 3, 4, 5]; let mut sum = 0; iter_vec(copy v, |i| { iter_vec(copy v, |j| { - log(error, i * j); - sum += i * j; + log(error, *i * *j); + sum += *i * *j; }); }); log(error, sum); diff --git a/src/test/run-pass/closure-inference.rs b/src/test/run-pass/closure-inference.rs index 99c8fd6e2d301..33202193acbc8 100644 --- a/src/test/run-pass/closure-inference.rs +++ b/src/test/run-pass/closure-inference.rs @@ -9,7 +9,6 @@ // except according to those terms. // xfail-fast -#[legacy_modes]; fn foo(i: int) -> int { i + 1 } diff --git a/src/test/run-pass/expr-alt-generic-box2.rs b/src/test/run-pass/expr-alt-generic-box2.rs index 224ae2cf78e23..e5c82f9edb019 100644 --- a/src/test/run-pass/expr-alt-generic-box2.rs +++ b/src/test/run-pass/expr-alt-generic-box2.rs @@ -11,8 +11,6 @@ // xfail-fast // -*- rust -*- -#[legacy_modes]; - type compare = fn@(T, T) -> bool; fn test_generic(expected: T, eq: compare) { @@ -21,7 +19,7 @@ fn test_generic(expected: T, eq: compare) { } fn test_vec() { - fn compare_box(&&v1: @int, &&v2: @int) -> bool { return v1 == v2; } + fn compare_box(v1: @int, v2: @int) -> bool { return v1 == v2; } test_generic::<@int>(@1, compare_box); } diff --git a/src/test/run-pass/expr-alt-generic-unique2.rs b/src/test/run-pass/expr-alt-generic-unique2.rs index cb641b493e0a4..7f1c2e17dd524 100644 --- a/src/test/run-pass/expr-alt-generic-unique2.rs +++ b/src/test/run-pass/expr-alt-generic-unique2.rs @@ -11,8 +11,6 @@ // xfail-fast // -*- rust -*- -#[legacy_modes]; - type compare = fn@(T, T) -> bool; fn test_generic(expected: T, eq: compare) { @@ -24,7 +22,7 @@ fn test_generic(expected: T, eq: compare) { } fn test_vec() { - fn compare_box(&&v1: ~int, &&v2: ~int) -> bool { return v1 == v2; } + fn compare_box(v1: ~int, v2: ~int) -> bool { return v1 == v2; } test_generic::<~int>(~1, compare_box); } diff --git a/src/test/run-pass/expr-alt-generic.rs b/src/test/run-pass/expr-alt-generic.rs index 95710eecddb86..dcffcd0ad23f6 100644 --- a/src/test/run-pass/expr-alt-generic.rs +++ b/src/test/run-pass/expr-alt-generic.rs @@ -10,7 +10,6 @@ // xfail-fast // -*- rust -*- -#[legacy_modes]; type compare = fn@(T, T) -> bool; @@ -20,7 +19,7 @@ fn test_generic(expected: T, eq: compare) { } fn test_bool() { - fn compare_bool(&&b1: bool, &&b2: bool) -> bool { return b1 == b2; } + fn compare_bool(b1: bool, b2: bool) -> bool { return b1 == b2; } test_generic::(true, compare_bool); } diff --git a/src/test/run-pass/expr-block-generic.rs b/src/test/run-pass/expr-block-generic.rs index 3d1ef7dbea2c8..ef726e47df3c9 100644 --- a/src/test/run-pass/expr-block-generic.rs +++ b/src/test/run-pass/expr-block-generic.rs @@ -11,7 +11,6 @@ // xfail-fast -#[legacy_modes]; // Tests for standalone blocks as expressions with dynamic type sizes type compare = fn@(T, T) -> bool; @@ -22,7 +21,7 @@ fn test_generic(expected: T, eq: compare) { } fn test_bool() { - fn compare_bool(&&b1: bool, &&b2: bool) -> bool { return b1 == b2; } + fn compare_bool(b1: bool, b2: bool) -> bool { return b1 == b2; } test_generic::(true, compare_bool); } diff --git a/src/test/run-pass/expr-copy.rs b/src/test/run-pass/expr-copy.rs index 56cc5204b0a23..21080280d2c4c 100644 --- a/src/test/run-pass/expr-copy.rs +++ b/src/test/run-pass/expr-copy.rs @@ -9,9 +9,8 @@ // except according to those terms. // xfail-fast -#[legacy_modes]; -fn f(arg: A) { +fn f(arg: &A) { arg.a = 100; } @@ -19,9 +18,9 @@ struct A { mut a: int } pub fn main() { let x = A {a: 10}; - f(x); + f(&x); assert x.a == 100; x.a = 20; - f(copy x); + f(© x); assert x.a == 20; } diff --git a/src/test/run-pass/expr-if-generic.rs b/src/test/run-pass/expr-if-generic.rs index 179268a22b802..4e52fec5c1955 100644 --- a/src/test/run-pass/expr-if-generic.rs +++ b/src/test/run-pass/expr-if-generic.rs @@ -10,7 +10,6 @@ // xfail-fast // -*- rust -*- -#[legacy_modes]; // Tests for if as expressions with dynamic type sizes type compare = fn@(T, T) -> bool; @@ -21,7 +20,7 @@ fn test_generic(expected: T, not_expected: T, eq: compare) { } fn test_bool() { - fn compare_bool(&&b1: bool, &&b2: bool) -> bool { return b1 == b2; } + fn compare_bool(b1: bool, b2: bool) -> bool { return b1 == b2; } test_generic::(true, false, compare_bool); } diff --git a/src/test/run-pass/fixed-point-bind-box.rs b/src/test/run-pass/fixed-point-bind-box.rs index 48772aa788973..a1b41ca4b5278 100644 --- a/src/test/run-pass/fixed-point-bind-box.rs +++ b/src/test/run-pass/fixed-point-bind-box.rs @@ -9,7 +9,6 @@ // except according to those terms. // xfail-fast -#[legacy_modes]; fn fix_help(f: extern fn(fn@(A) -> B, A) -> B, x: A) -> B { return f( |a| fix_help(f, a), x); @@ -19,7 +18,7 @@ fn fix(f: extern fn(fn@(A) -> B, A) -> B) -> fn@(A) -> B { return |a| fix_help(f, a); } -fn fact_(f: fn@(&&v: int) -> int, &&n: int) -> int { +fn fact_(f: fn@(v: int) -> int, n: int) -> int { // fun fact 0 = 1 return if n == 0 { 1 } else { n * f(n - 1) }; } diff --git a/src/test/run-pass/fixed-point-bind-unique.rs b/src/test/run-pass/fixed-point-bind-unique.rs index 8547180b933ff..dfd52940e73c4 100644 --- a/src/test/run-pass/fixed-point-bind-unique.rs +++ b/src/test/run-pass/fixed-point-bind-unique.rs @@ -9,7 +9,6 @@ // except according to those terms. // xfail-fast -#[legacy_modes]; fn fix_help(f: extern fn(fn@(A) -> B, A) -> B, x: A) -> B { return f(|a| fix_help(f, a), x); @@ -19,7 +18,7 @@ fn fix(f: extern fn(fn@(A) -> B, A) -> B) -> fn@(A) -> B { return |a| fix_help(f, a); } -fn fact_(f: fn@(&&v: int) -> int, &&n: int) -> int { +fn fact_(f: fn@(v: int) -> int, n: int) -> int { // fun fact 0 = 1 return if n == 0 { 1 } else { n * f(n - 1) }; } diff --git a/src/test/run-pass/generic-temporary.rs b/src/test/run-pass/generic-temporary.rs index d2100e8d065f0..d9c6dcef1f5cb 100644 --- a/src/test/run-pass/generic-temporary.rs +++ b/src/test/run-pass/generic-temporary.rs @@ -9,11 +9,10 @@ // except according to those terms. // xfail-fast -#[legacy_modes]; fn mk() -> int { return 1; } -fn chk(&&a: int) { log(debug, a); assert (a == 1); } +fn chk(a: int) { log(debug, a); assert (a == 1); } fn apply(produce: extern fn() -> T, consume: extern fn(T)) { @@ -22,6 +21,6 @@ fn apply(produce: extern fn() -> T, pub fn main() { let produce: extern fn() -> int = mk; - let consume: extern fn(&&v: int) = chk; + let consume: extern fn(v: int) = chk; apply::(produce, consume); } diff --git a/src/test/run-pass/issue-2185.rs b/src/test/run-pass/issue-2185.rs index f3f7f4dacbad4..a8533b574e86c 100644 --- a/src/test/run-pass/issue-2185.rs +++ b/src/test/run-pass/issue-2185.rs @@ -14,8 +14,6 @@ // However, the condition it was testing seemed complex enough to // warrant still having a test, so I inlined the old definitions. -#[legacy_modes]; - trait iterable { fn iter(blk: fn(A)); } @@ -34,7 +32,7 @@ fn filter>(self: IA, prd: fn@(A) -> bool, blk: fn(A)) { } } -fn foldl>(self: IA, +b0: B, blk: fn(B, A) -> B) -> B { +fn foldl>(self: IA, b0: B, blk: fn(B, A) -> B) -> B { let mut b = b0; do self.iter |a| { b = blk(b, a); @@ -52,7 +50,7 @@ fn range(lo: uint, hi: uint, it: fn(uint)) { pub fn main() { let range: fn@(fn&(uint)) = |a| range(0u, 1000u, a); - let filt: fn@(fn&(&&v: uint)) = |a| filter( + let filt: fn@(fn&(v: uint)) = |a| filter( range, |&&n: uint| n % 3u != 0u && n % 5u != 0u, a); diff --git a/src/test/run-pass/monad.rs b/src/test/run-pass/monad.rs index 5a3adc14e433b..5f4e6e984a44b 100644 --- a/src/test/run-pass/monad.rs +++ b/src/test/run-pass/monad.rs @@ -9,42 +9,41 @@ // except according to those terms. // xfail-fast -#[legacy_modes]; trait vec_monad { - fn bind(f: fn(A) -> ~[B]) -> ~[B]; + fn bind(f: fn(&A) -> ~[B]) -> ~[B]; } impl vec_monad for ~[A] { - fn bind(f: fn(A) -> ~[B]) -> ~[B] { + fn bind(f: fn(&A) -> ~[B]) -> ~[B] { let mut r = ~[]; - for self.each |elt| { r += f(*elt); } + for self.each |elt| { r += f(elt); } r } } trait option_monad { - fn bind(f: fn(A) -> Option) -> Option; + fn bind(f: fn(&A) -> Option) -> Option; } impl option_monad for Option { - fn bind(f: fn(A) -> Option) -> Option { + fn bind(f: fn(&A) -> Option) -> Option { match self { - Some(ref a) => { f(*a) } + Some(ref a) => { f(a) } None => { None } } } } fn transform(x: Option) -> Option<~str> { - x.bind(|n| Some(n + 1) ).bind(|n| Some(int::str(n)) ) + x.bind(|n| Some(*n + 1) ).bind(|n| Some(int::str(*n)) ) } pub fn main() { assert transform(Some(10)) == Some(~"11"); assert transform(None) == None; assert (~[~"hi"]) - .bind(|x| ~[copy x, x + ~"!"] ) - .bind(|x| ~[copy x, x + ~"?"] ) == + .bind(|x| ~[copy *x, *x + ~"!"] ) + .bind(|x| ~[copy *x, *x + ~"?"] ) == ~[~"hi", ~"hi?", ~"hi!", ~"hi!?"]; } diff --git a/src/test/run-pass/operator-overloading.rs b/src/test/run-pass/operator-overloading.rs index 3c6a347137752..c9e8c6f4b1491 100644 --- a/src/test/run-pass/operator-overloading.rs +++ b/src/test/run-pass/operator-overloading.rs @@ -9,7 +9,6 @@ // except according to those terms. // xfail-fast -#[legacy_modes]; struct Point { x: int, diff --git a/src/test/run-pass/reflect-visit-data.rs b/src/test/run-pass/reflect-visit-data.rs index 890599f9b8bf4..b25a95cbb8a56 100644 --- a/src/test/run-pass/reflect-visit-data.rs +++ b/src/test/run-pass/reflect-visit-data.rs @@ -9,7 +9,6 @@ // except according to those terms. // xfail-fast -#[legacy_modes]; use core::bool; use intrinsic::{TyDesc, get_tydesc, visit_tydesc, TyVisitor}; diff --git a/src/test/run-pass/regions-params.rs b/src/test/run-pass/regions-params.rs index 0691f42bb7b27..ea981dc5fb70a 100644 --- a/src/test/run-pass/regions-params.rs +++ b/src/test/run-pass/regions-params.rs @@ -9,7 +9,6 @@ // except according to those terms. // xfail-fast -#[legacy_modes]; fn region_identity(x: &r/uint) -> &r/uint { x } diff --git a/src/test/run-pass/resource-generic.rs b/src/test/run-pass/resource-generic.rs index 347c14538a10d..d32a60ee4f84b 100644 --- a/src/test/run-pass/resource-generic.rs +++ b/src/test/run-pass/resource-generic.rs @@ -9,7 +9,6 @@ // except according to those terms. // xfail-fast -#[legacy_modes]; struct Arg {val: T, fin: extern fn(T)} @@ -31,7 +30,7 @@ fn finish(arg: Arg) -> finish { pub fn main() { let box = @mut 10; - fn dec_box(&&i: @mut int) { *i -= 1; } + fn dec_box(i: @mut int) { *i -= 1; } { let _i = finish(Arg{val: box, fin: dec_box}); } assert (*box == 9); diff --git a/src/test/run-pass/ret-break-cont-in-block.rs b/src/test/run-pass/ret-break-cont-in-block.rs index e70c72f550d0d..2f0f9e5ae6ad7 100644 --- a/src/test/run-pass/ret-break-cont-in-block.rs +++ b/src/test/run-pass/ret-break-cont-in-block.rs @@ -9,14 +9,13 @@ // except according to those terms. // xfail-fast -#[legacy_modes]; use cmp::Eq; -fn iter(v: ~[T], it: fn(T) -> bool) { +fn iter(v: ~[T], it: fn(&T) -> bool) { let mut i = 0u, l = v.len(); while i < l { - if !it(v[i]) { break; } + if !it(&v[i]) { break; } i += 1u; } } @@ -24,7 +23,7 @@ fn iter(v: ~[T], it: fn(T) -> bool) { fn find_pos(n: T, h: ~[T]) -> Option { let mut i = 0u; for iter(copy h) |e| { - if e == n { return Some(i); } + if *e == n { return Some(i); } i += 1u; } None @@ -33,9 +32,9 @@ fn find_pos(n: T, h: ~[T]) -> Option { fn bail_deep(x: ~[~[bool]]) { let mut seen = false; for iter(copy x) |x| { - for iter(copy x) |x| { + for iter(copy *x) |x| { assert !seen; - if x { seen = true; return; } + if *x { seen = true; return; } } } assert !seen; @@ -44,7 +43,7 @@ fn bail_deep(x: ~[~[bool]]) { fn ret_deep() -> ~str { for iter(~[1, 2]) |e| { for iter(~[3, 4]) |x| { - if e + x > 4 { return ~"hi"; } + if *e + *x > 4 { return ~"hi"; } } } return ~"bye"; diff --git a/src/test/run-pass/sendfn-generic-fn.rs b/src/test/run-pass/sendfn-generic-fn.rs index 2dc008931e490..8ae976ccadec2 100644 --- a/src/test/run-pass/sendfn-generic-fn.rs +++ b/src/test/run-pass/sendfn-generic-fn.rs @@ -9,7 +9,6 @@ // except according to those terms. // xfail-fast -#[legacy_modes]; pub fn main() { test05(); } @@ -19,23 +18,23 @@ fn make_generic_record(a: A, b: B) -> Pair { return Pair {a: a, b: b}; } -fn test05_start(&&f: fn~(&&v: float, &&v: ~str) -> Pair) { - let p = f(22.22f, ~"Hi"); +fn test05_start(f: &~fn(v: float, v: ~str) -> Pair) { + let p = (*f)(22.22f, ~"Hi"); log(debug, copy p); assert p.a == 22.22f; assert p.b == ~"Hi"; - let q = f(44.44f, ~"Ho"); + let q = (*f)(44.44f, ~"Ho"); log(debug, copy q); assert q.a == 44.44f; assert q.b == ~"Ho"; } -fn spawn(f: extern fn(fn~(A,B)->Pair)) { +fn spawn(f: extern fn(&~fn(A,B)->Pair)) { let arg = fn~(a: A, b: B) -> Pair { return make_generic_record(a, b); }; - task::spawn(|| f(arg) ); + task::spawn(|| f(&arg) ); } fn test05() { diff --git a/src/test/run-pass/sendfn-is-a-block.rs b/src/test/run-pass/sendfn-is-a-block.rs index 2d995191785d2..099ba326300ee 100644 --- a/src/test/run-pass/sendfn-is-a-block.rs +++ b/src/test/run-pass/sendfn-is-a-block.rs @@ -9,7 +9,6 @@ // except according to those terms. // xfail-fast -#[legacy_modes]; fn test(f: fn(uint) -> uint) -> uint { return f(22u); diff --git a/src/test/run-pass/static-impl.rs b/src/test/run-pass/static-impl.rs index 5cc54da28b22c..9d7c2fe446d32 100644 --- a/src/test/run-pass/static-impl.rs +++ b/src/test/run-pass/static-impl.rs @@ -9,7 +9,6 @@ // except according to those terms. // xfail-fast -#[legacy_modes]; pub trait plus { fn plus() -> int; @@ -40,16 +39,16 @@ impl uint_utils for uint { trait vec_utils { fn length_() -> uint; - fn iter_(f: fn(T)); - fn map_(f: fn(T) -> U) -> ~[U]; + fn iter_(f: fn(&T)); + fn map_(f: fn(&T) -> U) -> ~[U]; } impl vec_utils for ~[T] { fn length_() -> uint { vec::len(self) } - fn iter_(f: fn(T)) { for self.each |x| { f(*x); } } - fn map_(f: fn(T) -> U) -> ~[U] { + fn iter_(f: fn(&T)) { for self.each |x| { f(x); } } + fn map_(f: fn(&T) -> U) -> ~[U] { let mut r = ~[]; - for self.each |elt| { r += ~[f(*elt)]; } + for self.each |elt| { r += ~[f(elt)]; } r } } @@ -59,8 +58,8 @@ pub fn main() { assert (~"hi").plus() == 200; assert (~[1]).length_().str() == ~"1"; - assert (~[3, 4]).map_(|a| a + 4 )[0] == 7; - assert (~[3, 4]).map_::(|a| a as uint + 4u )[0] == 7u; + assert (~[3, 4]).map_(|a| *a + 4 )[0] == 7; + assert (~[3, 4]).map_::(|a| *a as uint + 4u )[0] == 7u; let mut x = 0u; 10u.multi(|_n| x += 2u ); assert x == 20u; diff --git a/src/test/run-pass/task-comm-10.rs b/src/test/run-pass/task-comm-10.rs index 379b9acf6f554..21c141d18a2d8 100644 --- a/src/test/run-pass/task-comm-10.rs +++ b/src/test/run-pass/task-comm-10.rs @@ -9,11 +9,10 @@ // except according to those terms. // xfail-fast -#[legacy_modes]; extern mod std; -fn start(c: comm::Chan>) { +fn start(c: &comm::Chan>) { let (p, ch) = comm::stream(); c.send(ch); @@ -29,7 +28,7 @@ fn start(c: comm::Chan>) { pub fn main() { let (p, ch) = comm::stream(); - let child = task::spawn(|| start(ch) ); + let child = task::spawn(|| start(&ch) ); let c = p.recv(); c.send(~"A"); diff --git a/src/test/run-pass/task-comm-11.rs b/src/test/run-pass/task-comm-11.rs index 3e3eefd26ba7c..b2012fbd2dd5e 100644 --- a/src/test/run-pass/task-comm-11.rs +++ b/src/test/run-pass/task-comm-11.rs @@ -9,17 +9,16 @@ // except according to those terms. // xfail-fast -#[legacy_modes]; extern mod std; -fn start(c: comm::Chan>) { +fn start(c: &comm::Chan>) { let (p, ch) = comm::stream(); c.send(ch); } pub fn main() { let (p, ch) = comm::stream(); - let child = task::spawn(|| start(ch) ); + let child = task::spawn(|| start(&ch) ); let c = p.recv(); } diff --git a/src/test/run-pass/task-comm-14.rs b/src/test/run-pass/task-comm-14.rs index c5179652fdc89..053499ee5ed1f 100644 --- a/src/test/run-pass/task-comm-14.rs +++ b/src/test/run-pass/task-comm-14.rs @@ -9,7 +9,6 @@ // except according to those terms. // xfail-fast -#[legacy_modes]; pub fn main() { let po = comm::PortSet(); @@ -20,7 +19,7 @@ pub fn main() { log(debug, i); let (p, ch) = comm::stream(); po.add(p); - task::spawn({let i = i; || child(i, ch)}); + task::spawn({let i = i; || child(i, &ch)}); i = i - 1; } @@ -37,7 +36,7 @@ pub fn main() { debug!("main thread exiting"); } -fn child(x: int, ch: comm::Chan) { +fn child(x: int, ch: &comm::Chan) { log(debug, x); ch.send(x); } diff --git a/src/test/run-pass/task-comm-15.rs b/src/test/run-pass/task-comm-15.rs index 525cafef169ef..308627720622c 100644 --- a/src/test/run-pass/task-comm-15.rs +++ b/src/test/run-pass/task-comm-15.rs @@ -10,11 +10,10 @@ // xfail-fast // xfail-win32 -#[legacy_modes]; extern mod std; -fn start(c: comm::Chan, i0: int) { +fn start(c: &comm::Chan, i0: int) { let mut i = i0; while i > 0 { c.send(0); @@ -28,6 +27,6 @@ pub fn main() { // the child's point of view the receiver may die. We should // drop messages on the floor in this case, and not crash! let (p, ch) = comm::stream(); - task::spawn(|| start(ch, 10)); + task::spawn(|| start(&ch, 10)); p.recv(); } diff --git a/src/test/run-pass/task-comm-3.rs b/src/test/run-pass/task-comm-3.rs index 9bbe20c2e1332..9ef76e06d7e83 100644 --- a/src/test/run-pass/task-comm-3.rs +++ b/src/test/run-pass/task-comm-3.rs @@ -9,14 +9,13 @@ // except according to those terms. // xfail-fast -#[legacy_modes]; extern mod std; use core::comm::Chan; pub fn main() { debug!("===== WITHOUT THREADS ====="); test00(); } -fn test00_start(ch: Chan, message: int, count: int) { +fn test00_start(ch: &Chan, message: int, count: int) { debug!("Starting test00_start"); let mut i: int = 0; while i < count { @@ -45,7 +44,7 @@ fn test00() { results.push(r); }).spawn({ let i = i; - || test00_start(ch, i, number_of_messages) + || test00_start(&ch, i, number_of_messages) }); i = i + 1; } diff --git a/src/test/run-pass/task-comm-9.rs b/src/test/run-pass/task-comm-9.rs index 75fcd12c312d0..4e54053865788 100644 --- a/src/test/run-pass/task-comm-9.rs +++ b/src/test/run-pass/task-comm-9.rs @@ -9,13 +9,12 @@ // except according to those terms. // xfail-fast -#[legacy_modes]; extern mod std; pub fn main() { test00(); } -fn test00_start(c: comm::Chan, number_of_messages: int) { +fn test00_start(c: &comm::Chan, number_of_messages: int) { let mut i: int = 0; while i < number_of_messages { c.send(i + 0); i += 1; } } @@ -30,7 +29,7 @@ fn test00() { let mut result = None; do task::task().future_result(|+r| { result = Some(r); }).spawn || { - test00_start(ch, number_of_messages); + test00_start(&ch, number_of_messages); } let mut i: int = 0; diff --git a/src/test/run-pass/trait-generic.rs b/src/test/run-pass/trait-generic.rs index ff902490e7c27..1f32cc94de97d 100644 --- a/src/test/run-pass/trait-generic.rs +++ b/src/test/run-pass/trait-generic.rs @@ -9,7 +9,6 @@ // except according to those terms. // xfail-fast -#[legacy_modes]; trait to_str { fn to_str() -> ~str; @@ -25,12 +24,12 @@ impl to_str for () { } trait map { - fn map(f: fn(T) -> U) -> ~[U]; + fn map(f: fn(&T) -> U) -> ~[U]; } impl map for ~[T] { - fn map(f: fn(T) -> U) -> ~[U] { + fn map(f: fn(&T) -> U) -> ~[U] { let mut r = ~[]; - for self.each |x| { r += ~[f(*x)]; } + for self.each |x| { r += ~[f(x)]; } r } } diff --git a/src/test/run-pass/type-param-constraints.rs b/src/test/run-pass/type-param-constraints.rs index 684e0a8aaaed8..bd6165806c273 100644 --- a/src/test/run-pass/type-param-constraints.rs +++ b/src/test/run-pass/type-param-constraints.rs @@ -9,7 +9,6 @@ // except according to those terms. // xfail-fast -#[legacy_modes]; fn p_foo(pinned: T) { } fn s_foo(shared: T) { }