test: De-mut the test suite. rs=demuting

Author: pcwalton

src/test/auxiliary/issue_3882.rs

@@ -10,10 +10,10 @@
 
 mod issue_3882 {
     struct Completions {
-        mut len: libc::size_t,
+        len: libc::size_t,
     }
 
     extern mod c {
-        fn linenoiseAddCompletion(lc: *Completions);
+        fn linenoiseAddCompletion(lc: *mut Completions);
     }
 }

src/test/bench/shootout-fasta.rs

@@ -21,10 +21,10 @@ use io::WriterUtil;
 fn LINE_LENGTH() -> uint { return 60u; }
 
 struct MyRandom {
-    mut last: u32
+    last: u32
 }
 
-fn myrandom_next(r: @MyRandom, mx: u32) -> u32 {
+fn myrandom_next(r: @mut MyRandom, mx: u32) -> u32 {
     r.last = (r.last * 3877u32 + 29573u32) % 139968u32;
     mx * r.last / 139968u32
 }
@@ -59,7 +59,7 @@ fn select_random(r: u32, genelist: ~[AminoAcids]) -> char {
 
 fn make_random_fasta(wr: io::Writer, id: ~str, desc: ~str, genelist: ~[AminoAcids], n: int) {
     wr.write_line(~">" + id + ~" " + desc);
-    let rng = @MyRandom {mut last: rand::Rng().next()};
+    let rng = @mut MyRandom {last: rand::Rng().next()};
     let mut op: ~str = ~"";
     for uint::range(0u, n as uint) |_i| {
         str::push_char(&mut op, select_random(myrandom_next(rng, 100u32),

src/test/bench/shootout-nbody.rs

@@ -170,67 +170,80 @@ mod Body {
     // was 4 * PI * PI originally
     pub const DAYS_PER_YEAR: float = 365.24;
 
-    pub struct Props
-        {mut x: float,
-         mut y: float,
-         mut z: float,
-         mut vx: float,
-         mut vy: float,
-         mut vz: float,
-         mass: float}
+    pub struct Props {
+        x: float,
+        y: float,
+        z: float,
+        vx: float,
+        vy: float,
+        vz: float,
+        mass: float
+    }
 
     pub fn jupiter() -> Body::Props {
-        return Props {mut x: 4.84143144246472090e+00,
-             mut y: -1.16032004402742839e+00,
-             mut z: -1.03622044471123109e-01,
-             mut vx: 1.66007664274403694e-03 * DAYS_PER_YEAR,
-             mut vy: 7.69901118419740425e-03 * DAYS_PER_YEAR,
-             mut vz: -6.90460016972063023e-05 * DAYS_PER_YEAR,
-             mass: 9.54791938424326609e-04 * SOLAR_MASS};
+        return Props {
+            x: 4.84143144246472090e+00,
+            y: -1.16032004402742839e+00,
+            z: -1.03622044471123109e-01,
+            vx: 1.66007664274403694e-03 * DAYS_PER_YEAR,
+            vy: 7.69901118419740425e-03 * DAYS_PER_YEAR,
+            vz: -6.90460016972063023e-05 * DAYS_PER_YEAR,
+            mass: 9.54791938424326609e-04 * SOLAR_MASS
+        };
     }
 
     pub fn saturn() -> Body::Props {
-        return Props {mut x: 8.34336671824457987e+00,
-             mut y: 4.12479856412430479e+00,
-             mut z: -4.03523417114321381e-01,
-             mut vx: -2.76742510726862411e-03 * DAYS_PER_YEAR,
-             mut vy: 4.99852801234917238e-03 * DAYS_PER_YEAR,
-             mut vz: 2.30417297573763929e-05 * DAYS_PER_YEAR,
-             mass: 2.85885980666130812e-04 * SOLAR_MASS};
+        return Props {
+            x: 8.34336671824457987e+00,
+            y: 4.12479856412430479e+00,
+            z: -4.03523417114321381e-01,
+            vx: -2.76742510726862411e-03 * DAYS_PER_YEAR,
+            vy: 4.99852801234917238e-03 * DAYS_PER_YEAR,
+            vz: 2.30417297573763929e-05 * DAYS_PER_YEAR,
+            mass: 2.85885980666130812e-04 * SOLAR_MASS
+        };
     }
 
     pub fn uranus() -> Body::Props {
-        return Props {mut x: 1.28943695621391310e+01,
-             mut y: -1.51111514016986312e+01,
-             mut z: -2.23307578892655734e-01,
-             mut vx: 2.96460137564761618e-03 * DAYS_PER_YEAR,
-             mut vy: 2.37847173959480950e-03 * DAYS_PER_YEAR,
-             mut vz: -2.96589568540237556e-05 * DAYS_PER_YEAR,
-             mass: 4.36624404335156298e-05 * SOLAR_MASS};
+        return Props {
+            x: 1.28943695621391310e+01,
+            y: -1.51111514016986312e+01,
+            z: -2.23307578892655734e-01,
+            vx: 2.96460137564761618e-03 * DAYS_PER_YEAR,
+            vy: 2.37847173959480950e-03 * DAYS_PER_YEAR,
+            vz: -2.96589568540237556e-05 * DAYS_PER_YEAR,
+            mass: 4.36624404335156298e-05 * SOLAR_MASS
+        };
     }
 
     pub fn neptune() -> Body::Props {
-        return Props {mut x: 1.53796971148509165e+01,
-             mut y: -2.59193146099879641e+01,
-             mut z: 1.79258772950371181e-01,
-             mut vx: 2.68067772490389322e-03 * DAYS_PER_YEAR,
-             mut vy: 1.62824170038242295e-03 * DAYS_PER_YEAR,
-             mut vz: -9.51592254519715870e-05 * DAYS_PER_YEAR,
-             mass: 5.15138902046611451e-05 * SOLAR_MASS};
+        return Props {
+            x: 1.53796971148509165e+01,
+            y: -2.59193146099879641e+01,
+            z: 1.79258772950371181e-01,
+            vx: 2.68067772490389322e-03 * DAYS_PER_YEAR,
+            vy: 1.62824170038242295e-03 * DAYS_PER_YEAR,
+            vz: -9.51592254519715870e-05 * DAYS_PER_YEAR,
+            mass: 5.15138902046611451e-05 * SOLAR_MASS
+        };
     }
 
     pub fn sun() -> Body::Props {
-        return Props {mut x: 0.0,
-             mut y: 0.0,
-             mut z: 0.0,
-             mut vx: 0.0,
-             mut vy: 0.0,
-             mut vz: 0.0,
-             mass: SOLAR_MASS};
+        return Props {
+            x: 0.0,
+            y: 0.0,
+            z: 0.0,
+            vx: 0.0,
+            vy: 0.0,
+            vz: 0.0,
+            mass: SOLAR_MASS
+        };
     }
 
     pub fn offset_momentum(props: &mut Body::Props,
-                       px: float, py: float, pz: float) {
+                           px: float,
+                           py: float,
+                           pz: float) {
         props.vx = -px / SOLAR_MASS;
         props.vy = -py / SOLAR_MASS;
         props.vz = -pz / SOLAR_MASS;

src/test/compile-fail/borrowck-assign-comp.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-struct point {x: int, mut y: int }
+struct point { x: int, y: int }
 
 fn a() {
     let mut p = point {x: 3, y: 4};
@@ -20,30 +20,21 @@ fn a() {
     p.x = 5; //~ ERROR assigning to mutable field prohibited due to outstanding loan
 }
 
-fn b() {
-    let mut p = point {x: 3, mut y: 4};
-    // This assignment is legal because `y` is inherently mutable (and
-    // hence &_q.y is &mut int).
-    let _q = &p;
-
-    p.y = 5;
-}
-
 fn c() {
     // this is sort of the opposite.  We take a loan to the interior of `p`
     // and then try to overwrite `p` as a whole.
 
-    let mut p = point {x: 3, mut y: 4};
+    let mut p = point {x: 3, y: 4};
     let _q = &p.y; //~ NOTE loan of mutable local variable granted here
-    p = point {x: 5, mut y: 7};//~ ERROR assigning to mutable local variable prohibited due to outstanding loan
+    p = point {x: 5, y: 7};//~ ERROR assigning to mutable local variable prohibited due to outstanding loan
     copy p;
 }
 
 fn d() {
     // just for completeness's sake, the easy case, where we take the
     // address of a subcomponent and then modify that subcomponent:
 
-    let mut p = point {x: 3, mut y: 4};
+    let mut p = point {x: 3, y: 4};
     let _q = &p.y; //~ NOTE loan of mutable field granted here
     p.y = 5; //~ ERROR assigning to mutable field prohibited due to outstanding loan
     copy p;

src/test/compile-fail/borrowck-call-sendfn.rs

@@ -10,7 +10,7 @@
 
 // xfail-test #2978
 
-fn call(x: @{mut f: fn~()}) {
+fn call(x: @{f: fn~()}) {
     x.f(); //~ ERROR foo
     //~^ NOTE bar
 }

src/test/compile-fail/borrowck-imm-ref-to-mut-rec-field-issue-3162-b.rs

@@ -9,19 +9,19 @@
 // except according to those terms.
 
 struct node_ {
-    mut a: ~cycle
+    a: ~cycle
 }
 
 enum cycle {
     node(node_),
     empty
 }
 fn main() {
-    let x = ~node(node_ {mut a: ~empty});
+    let mut x = ~node(node_ {a: ~empty});
     // Create a cycle!
-    match *x { //~ NOTE loan of immutable local variable granted here
-      node(ref y) => {
-        y.a = x; //~ ERROR moving out of immutable local variable prohibited due to outstanding loan
+    match *x { //~ NOTE loan of mutable local variable granted here
+      node(ref mut y) => {
+        y.a = x; //~ ERROR moving out of mutable local variable prohibited due to outstanding loan
       }
       empty => {}
     };

src/test/compile-fail/borrowck-imm-ref-to-mut-rec-field-issue-3162.rs

@@ -14,10 +14,6 @@ fn box_mut(v: @mut ~int) {
     borrow(*v); //~ ERROR illegal borrow unless pure
 }
 
-fn box_rec_mut(v: @{mut f: ~int}) {
-    borrow(v.f); //~ ERROR illegal borrow unless pure
-}
-
 fn box_mut_rec(v: @mut {f: ~int}) {
     borrow(v.f); //~ ERROR illegal borrow unless pure
 }
@@ -42,14 +38,6 @@ fn box_const(v: @const ~int) {
     borrow(*v); //~ ERROR illegal borrow unless pure
 }
 
-fn box_rec_const(v: @{const f: ~int}) {
-    borrow(v.f); //~ ERROR illegal borrow unless pure
-}
-
-fn box_recs_const(v: @{f: {g: {const h: ~int}}}) {
-    borrow(v.f.g.h); //~ ERROR illegal borrow unless pure
-}
-
 fn box_const_rec(v: @const {f: ~int}) {
     borrow(v.f); //~ ERROR illegal borrow unless pure
 }

src/test/compile-fail/borrowck-mut-field-imm-base.rs

@@ -14,10 +14,6 @@ fn box_mut(v: &mut ~int) {
     borrow(*v); // OK: &mut -> &imm
 }
 
-fn box_rec_mut(v: &{mut f: ~int}) {
-    borrow(v.f); //~ ERROR illegal borrow unless pure
-}
-
 fn box_mut_rec(v: &mut {f: ~int}) {
     borrow(v.f); // OK: &mut -> &imm
 }
@@ -42,14 +38,6 @@ fn box_const(v: &const ~int) {
     borrow(*v); //~ ERROR illegal borrow unless pure
 }
 
-fn box_rec_const(v: &{const f: ~int}) {
-    borrow(v.f); //~ ERROR illegal borrow unless pure
-}
-
-fn box_recs_const(v: &{f: {g: {const h: ~int}}}) {
-    borrow(v.f.g.h); //~ ERROR illegal borrow unless pure
-}
-
 fn box_const_rec(v: &const {f: ~int}) {
     borrow(v.f); //~ ERROR illegal borrow unless pure
 }

src/test/compile-fail/borrowck-no-cycle-in-exchange-heap.rs

@@ -9,8 +9,8 @@
 // except according to those terms.
 
 // xfail-test
-type T = { mut f: fn@() };
-type S = { f: fn@() };
+struct T { f: fn@() };
+struct S { f: fn@() };
 
 fn fooS(t: S) {
 }
@@ -23,11 +23,11 @@ fn bar() {
 
 fn main() {
     let x: fn@() = bar;
-    fooS({f: x});
-    fooS({f: bar});
+    fooS(S {f: x});
+    fooS(S {f: bar});
 
     let x: fn@() = bar;
-    fooT({mut f: x});
-    fooT({mut f: bar});
+    fooT(T {f: x});
+    fooT(T {f: bar});
 }