test: Fix tests.

Author: pcwalton

src/llvm

@@ -23,7 +23,7 @@ pub mod kitties {
         fn meow_count(&mut self) -> uint { self.meows }
     }
 
-    pub fn cat<U>(in_x : uint, in_y : int, +in_info: ~[U]) -> cat<U> {
+    pub fn cat<U>(in_x : uint, in_y : int, in_info: ~[U]) -> cat<U> {
         cat {
             meows: in_x,
             how_hungry: in_y,

src/test/auxiliary/cci_class_6.rs

@@ -12,9 +12,9 @@
 // other tycons.
 
 fn coerce(b: &fn()) -> extern fn() {
-    fn lol(+f: extern fn(+v: &fn()) -> extern fn(),
-           +g: &fn()) -> extern fn() { return f(g); }
-    fn fn_id(+f: extern fn()) -> extern fn() { return f }
+    fn lol(f: extern fn(+v: &fn()) -> extern fn(),
+           g: &fn()) -> extern fn() { return f(g); }
+    fn fn_id(f: extern fn()) -> extern fn() { return f }
     return lol(fn_id, b);
     //~^ ERROR mismatched types
 }

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

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-fn match_ref(&&v: Option<int>) -> int {
+fn match_ref(v: Option<int>) -> int {
     match v {
       Some(ref i) => {
         *i
@@ -17,7 +17,7 @@ fn match_ref(&&v: Option<int>) -> int {
     }
 }
 
-fn match_ref_unused(&&v: Option<int>) {
+fn match_ref_unused(v: Option<int>) {
     match v {
       Some(_) => {}
       None => {}

src/test/compile-fail/borrowck-pat-enum.rs

@@ -8,13 +8,13 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-fn foo(+x: ~int) -> int {
+fn foo(x: ~int) -> int {
     let y = &*x;
     free(x); //~ ERROR cannot move out of `*x` because it is borrowed
     *y
 }
 
-fn free(+_x: ~int) {
+fn free(_x: ~int) {
 }
 
 fn main() {

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

@@ -18,7 +18,7 @@ impl Drop for X {
     }
 }
 
-fn unwrap(+x: X) -> ~str {
+fn unwrap(x: X) -> ~str {
     let X { x: y } = x; //~ ERROR deconstructing struct not allowed in pattern
     y
 }

src/test/compile-fail/disallowed-deconstructing-destructing-struct.rs

@@ -15,10 +15,10 @@ pub mod stream {
         use core::pipes;
 
         pub impl<T:Owned> Stream<T> {
-            pub fn recv() -> extern fn(+v: Stream<T>) -> ::stream::Stream<T> {
+            pub fn recv() -> extern fn(v: Stream<T>) -> ::stream::Stream<T> {
               // resolve really should report just one error here.
               // Change the test case when it changes.
-              pub fn recv(+pipe: Stream<T>) -> ::stream::Stream<T> { //~ ERROR attempt to use a type argument out of scope
+              pub fn recv(pipe: Stream<T>) -> ::stream::Stream<T> { //~ ERROR attempt to use a type argument out of scope
                 //~^ ERROR use of undeclared type name
                 //~^^ ERROR attempt to use a type argument out of scope
                 //~^^^ ERROR use of undeclared type name

src/test/compile-fail/issue-2766-a.rs

@@ -18,7 +18,7 @@ struct Foo {
     a: ()
 }
 
-fn deserialize_foo<__D: std::serialization::deserializer>(&&__d: __D) {
+fn deserialize_foo<__D: std::serialization::deserializer>(__d: __D) {
 }
 
 fn main() { let des = Deserializer(); let foo = deserialize_foo(des); }

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

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-fn send<T:Owned>(ch: _chan<T>, +data: T) {
+fn send<T:Owned>(ch: _chan<T>, data: T) {
     debug!(ch);
     debug!(data);
     fail!();

src/test/compile-fail/liveness-use-after-send.rs

@@ -11,7 +11,7 @@
 extern mod std;
 
 fn main() {
-    unsafe fn f(&&v: *const int) {
+    unsafe fn f(v: *const int) {
         *v = 1 //~ ERROR cannot assign
     }
 

src/test/compile-fail/mutable-huh-ptr-assign.rs

@@ -21,7 +21,7 @@ impl Drop for r {
     }
 }
 
-fn f<T>(+_i: ~[T], +_j: ~[T]) {
+fn f<T>(_i: ~[T], _j: ~[T]) {
 }
 
 fn main() {

src/test/compile-fail/unique-vec-res.rs

@@ -14,7 +14,7 @@
 
 extern mod std;
 
-fn getbig_and_fail(&&i: int) {
+fn getbig_and_fail(i: int) {
     let _r = and_then_get_big_again(5);
     if i != 0 {
         getbig_and_fail(i - 1);

src/test/run-fail/morestack3.rs

@@ -14,7 +14,7 @@
 
 extern mod std;
 
-fn getbig_and_fail(&&i: int) {
+fn getbig_and_fail(i: int) {
     let r = and_then_get_big_again(5);
     if i != 0 {
         getbig_and_fail(i - 1);

src/test/run-fail/morestack4.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // error-pattern:fail
-fn f(+_a: @int) {
+fn f(_a: @int) {
     fail!();
 }
 

src/test/run-fail/unwind-move.rs

@@ -10,9 +10,11 @@
 
 // xfail-fast
 
-struct X { x: int }
+struct X {
+    x: int
+}
 
-fn f1(a: &mut 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;

src/test/run-pass/argument-passing.rs

@@ -9,11 +9,11 @@
 // except according to those terms.
 
 trait Pushable<T> {
-    fn push_val(&mut self, +t: T);
+    fn push_val(&mut self, t: T);
 }
 
 impl<T> Pushable<T> for ~[T] {
-    fn push_val(&mut self, +t: T) {
+    fn push_val(&mut self, t: T) {
         self.push(t);
     }
 }

src/test/run-pass/auto-ref-sliceable.rs

@@ -11,7 +11,7 @@
 // xfail-fast
 extern mod std;
 use std::arc;
-fn dispose(+_x: arc::ARC<bool>) { unsafe { } }
+fn dispose(_x: arc::ARC<bool>) { unsafe { } }
 
 pub fn main() {
     let p = arc::ARC(true);

src/test/run-pass/bind-by-move.rs

@@ -10,15 +10,15 @@
 
 fn borrow(_v: &int) {}
 
-fn borrow_from_arg_imm_ref(&&v: ~int) {
+fn borrow_from_arg_imm_ref(v: ~int) {
     borrow(v);
 }
 
 fn borrow_from_arg_mut_ref(v: &mut ~int) {
     borrow(*v);
 }
 
-fn borrow_from_arg_copy(+v: ~int) {
+fn borrow_from_arg_copy(v: ~int) {
     borrow(v);
 }
 

src/test/run-pass/borrowck-lend-args.rs

@@ -14,7 +14,7 @@ fn want_slice(v: &[int]) -> int {
     return sum;
 }
 
-fn has_mut_vec(+v: ~[int]) -> int {
+fn has_mut_vec(v: ~[int]) -> int {
     want_slice(v)
 }
 

src/test/run-pass/borrowck-mut-vec-as-imm-slice.rs

@@ -25,7 +25,7 @@ impl frob for foo {
 }
 
 // Override default mode so that we are passing by value
-fn really_impure(++bar: baz) {
+fn really_impure(bar: baz) {
     bar.baz = 3;
 }
 

src/test/run-pass/borrowck-newtype-issue-2573.rs

@@ -26,7 +26,7 @@
 
 use core::comm::*;
 
-fn foo(&&x: ()) -> Port<()> {
+fn foo(x: ()) -> Port<()> {
     let (p, c) = stream::<()>();
     do task::spawn() {
         c.send(x);

src/test/run-pass/capture_nil.rs

@@ -12,6 +12,8 @@
 
 extern mod std;
 
-fn child2(&&s: ~str) { }
+fn child2(s: ~str) { }
 
-pub fn main() { let x = task::spawn(|| child2(~"hi") ); }
+pub fn main() {
+    let x = task::spawn(|| child2(~"hi"));
+}

src/test/run-pass/child-outlives-parent.rs

@@ -22,7 +22,7 @@ pub impl<U> cat<U> {
     fn meow_count(&mut self) -> uint { self.meows }
 }
 
-fn cat<U>(in_x : uint, in_y : int, +in_info: ~[U]) -> cat<U> {
+fn cat<U>(in_x : uint, in_y : int, in_info: ~[U]) -> cat<U> {
     cat {
         meows: in_x,
         how_hungry: in_y,

src/test/run-pass/class-poly-methods.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // xfail-win32
-fn adder(+x: @int, +y: @int) -> int { return *x + *y; }
+fn adder(x: @int, y: @int) -> int { return *x + *y; }
 fn failer() -> @int { fail!(); }
 pub fn main() {
     assert!(result::is_err(&task::try(|| {

src/test/run-pass/cleanup-copy-mode.rs

@@ -16,7 +16,7 @@ struct TwoU64s {
 }
 
 pub extern {
-    pub fn rust_dbg_extern_identity_TwoU64s(&&u: TwoU64s) -> TwoU64s;
+    pub fn rust_dbg_extern_identity_TwoU64s(u: TwoU64s) -> TwoU64s;
 }
 
 pub fn main() {

src/test/run-pass/extern-pass-TwoU64s-ref.rs

@@ -1,7 +1,7 @@
 extern {
-    pub unsafe fn vec_reserve_shared_actual(++t: *sys::TypeDesc,
-                                            ++v: **vec::raw::VecRepr,
-                                            ++n: libc::size_t);
+    pub unsafe fn vec_reserve_shared_actual(t: *sys::TypeDesc,
+                                            v: **vec::raw::VecRepr,
+                                            n: libc::size_t);
 }
 
 pub fn main() {

src/test/run-pass/extern-pub.rs

@@ -14,7 +14,7 @@ fn spawn<T:Owned>(val: T, f: extern fn(T)) {
     f(val);
 }
 
-fn f(+i: int) {
+fn f(i: int) {
     assert!(i == 100);
 }
 

src/test/run-pass/fn-bare-spawn.rs

@@ -18,7 +18,7 @@ mod bindgen {
 
     #[nolink]
     pub extern {
-        pub fn printf(++v: void);
+        pub fn printf(v: void);
     }
 }
 

src/test/run-pass/foreign-struct.rs

@@ -11,8 +11,8 @@
 mod rusti {
     #[abi = "rust-intrinsic"]
     pub extern "rust-intrinsic" {
-        pub fn move_val_init<T>(dst: &mut T, +src: T);
-        pub fn move_val<T>(dst: &mut T, +src: T);
+        pub fn move_val_init<T>(dst: &mut T, src: T);
+        pub fn move_val<T>(dst: &mut T, src: T);
     }
 }
 

src/test/run-pass/intrinsic-move-val.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-fn a_val(&&x: ~int, +y: ~int) -> int {
+fn a_val(x: ~int, y: ~int) -> int {
     *x + *y
 }