diff options
Diffstat (limited to 'src/test/run-pass/static-method-test.rs')
| -rw-r--r-- | src/test/run-pass/static-method-test.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/test/run-pass/static-method-test.rs b/src/test/run-pass/static-method-test.rs index 973897cd145..e06d09c564c 100644 --- a/src/test/run-pass/static-method-test.rs +++ b/src/test/run-pass/static-method-test.rs @@ -13,7 +13,7 @@ // A trait for objects that can be used to do an if-then-else // (No actual need for this to be static, but it is a simple test.) trait bool_like { - fn select<A>(b: Self, +x1: A, +x2: A) -> A; + fn select<A>(b: Self, x1: A, x2: A) -> A; } fn andand<T:bool_like + Copy>(x1: T, x2: T) -> T { @@ -21,38 +21,38 @@ fn andand<T:bool_like + Copy>(x1: T, x2: T) -> T { } impl bool_like for bool { - fn select<A>(&&b: bool, +x1: A, +x2: A) -> A { + fn select<A>(b: bool, x1: A, x2: A) -> A { if b { x1 } else { x2 } } } impl bool_like for int { - fn select<A>(&&b: int, +x1: A, +x2: A) -> A { + fn select<A>(b: int, x1: A, x2: A) -> A { if b != 0 { x1 } else { x2 } } } // A trait for sequences that can be constructed imperatively. trait buildable<A> { - fn build_sized(size: uint, builder: &fn(push: &fn(+v: A))) -> Self; + fn build_sized(size: uint, builder: &fn(push: &fn(v: A))) -> Self; } impl<A> buildable<A> for @[A] { #[inline(always)] - fn build_sized(size: uint, builder: &fn(push: &fn(+v: A))) -> @[A] { + fn build_sized(size: uint, builder: &fn(push: &fn(v: A))) -> @[A] { at_vec::build_sized(size, builder) } } impl<A> buildable<A> for ~[A] { #[inline(always)] - fn build_sized(size: uint, builder: &fn(push: &fn(+v: A))) -> ~[A] { + fn build_sized(size: uint, builder: &fn(push: &fn(v: A))) -> ~[A] { vec::build_sized(size, builder) } } #[inline(always)] -fn build<A, B: buildable<A>>(builder: &fn(push: &fn(+v: A))) -> B { +fn build<A, B: buildable<A>>(builder: &fn(push: &fn(v: A))) -> B { buildable::build_sized(4, builder) } |
