Remove variable name 'res' from test suite

Author: marijnh

src/comp/middle/tstate/states.rs

@@ -171,8 +171,8 @@ fn find_pre_post_state_call(&fn_ctxt fcx, &prestate pres, &@expr a,
 
 fn find_pre_post_state_exprs(&fn_ctxt fcx, &prestate pres, ast::node_id id,
                              &vec[@expr] es, controlflow cf) -> bool {
-    auto res = seq_states(fcx, pres, es);
-    auto changed = res._0;
+    auto rs = seq_states(fcx, pres, es);
+    auto changed = rs._0;
     changed = set_prestate_ann(fcx.ccx, id, pres) || changed;
     /* if this is a failing call, it sets everything as initialized */
     alt (cf) {
@@ -183,7 +183,7 @@ fn find_pre_post_state_exprs(&fn_ctxt fcx, &prestate pres, ast::node_id id,
                 changed;
         }
         case (_) { 
-            changed = set_poststate_ann(fcx.ccx, id, res._1) || changed;
+            changed = set_poststate_ann(fcx.ccx, id, rs._1) || changed;
         }
     }
     ret changed;

src/comp/middle/tstate/tritv.rs

@@ -241,15 +241,15 @@ fn to_vec(&t v) -> vec[uint] {
 
 fn to_str(&t v) -> str {
   let uint i = 0u;
-  let str res = "";
+  let str rs = "";
   while (i < v.nbits) {
-    res += alt (tritv_get(v, i)) {
+    rs += alt (tritv_get(v, i)) {
         case (dont_care) { "?" }
         case (ttrue)     { "1" }
         case (tfalse)    { "0" } };
     i += 1u;
   }
-  ret res;
+  ret rs;
 }
 
 //

src/test/compile-fail/break-outside-loop.rs

@@ -3,6 +3,6 @@
 fn main() {
   auto pth = break;
 
-  let rec(str t) res = rec(t=pth);
+  let rec(str t) rs = rec(t=pth);
 
 }

src/test/run-fail/rhs-type.rs

@@ -5,4 +5,4 @@
 // as a _|_-typed thing, not a str-typed thing
 // xfail-stage0
 // error-pattern:bye
-fn main() { auto pth = fail"bye"; let rec(str t) res = rec(t=pth); }
+fn main() { auto pth = fail"bye"; let rec(str t) rs = rec(t=pth); }

src/test/run-pass/alt-join.rs

@@ -7,14 +7,14 @@ import std::option::some;
 
 fn foo[T](&option::t[T] y) {
     let int x;
-    let vec[int] res = [];
+    let vec[int] rs = [];
     /* tests that x doesn't get put in the precondition for the 
        entire if expression */
 
     if (true) {
     } else {
         alt (y) { case (none[T]) { x = 17; } case (_) { x = 42; } }
-        res += [x];
+        rs += [x];
     }
     ret;
 }

src/test/run-pass/expr-alt-box.rs

@@ -5,13 +5,13 @@
 
 // Tests for alt as expressions resulting in boxed types
 fn test_box() {
-    auto res = alt (true) { case (true) { @100 } };
-    assert (*res == 100);
+    auto rs = alt (true) { case (true) { @100 } };
+    assert (*rs == 100);
 }
 
 fn test_str() {
-    auto res = alt (true) { case (true) { "happy" } };
-    assert (res == "happy");
+    auto rs = alt (true) { case (true) { "happy" } };
+    assert (rs == "happy");
 }
 
 fn main() { test_box(); test_str(); }

src/test/run-pass/expr-alt-struct.rs

@@ -5,14 +5,14 @@
 
 // Tests for alt as expressions resulting in structural types
 fn test_rec() {
-    auto res = alt (true) { case (true) { rec(i=100) } };
-    assert (res == rec(i=100));
+    auto rs = alt (true) { case (true) { rec(i=100) } };
+    assert (rs == rec(i=100));
 }
 
 fn test_tag() {
     tag mood { happy; sad; }
-    auto res = alt (true) { case (true) { happy } case (false) { sad } };
-    assert (res == happy);
+    auto rs = alt (true) { case (true) { happy } case (false) { sad } };
+    assert (rs == happy);
 }
 
 fn main() { test_rec(); test_tag(); }

src/test/run-pass/expr-alt.rs

@@ -5,37 +5,37 @@
 
 // Tests for using alt as an expression
 fn test_basic() {
-    let bool res = alt (true) { case (true) { true } case (false) { false } };
-    assert (res);
-    res = alt (false) { case (true) { false } case (false) { true } };
-    assert (res);
+    let bool rs = alt (true) { case (true) { true } case (false) { false } };
+    assert (rs);
+    rs = alt (false) { case (true) { false } case (false) { true } };
+    assert (rs);
 }
 
 fn test_inferrence() {
-    auto res = alt (true) { case (true) { true } case (false) { false } };
-    assert (res);
+    auto rs = alt (true) { case (true) { true } case (false) { false } };
+    assert (rs);
 }
 
 fn test_alt_as_alt_head() {
     // Yeah, this is kind of confusing ...
 
-    auto res =
+    auto rs =
         alt (alt (false) { case (true) { true } case (false) { false } }) {
             case (true) { false }
             case (false) { true }
         };
-    assert (res);
+    assert (rs);
 }
 
 fn test_alt_as_block_result() {
-    auto res =
+    auto rs =
         alt (false) {
             case (true) { false }
             case (false) {
                 alt (true) { case (true) { true } case (false) { false } }
             }
         };
-    assert (res);
+    assert (rs);
 }
 
 fn main() {

src/test/run-pass/expr-block-fn.rs

@@ -4,8 +4,8 @@ fn test_fn() {
     type t = fn() -> int ;
 
     fn ten() -> int { ret 10; }
-    let t res = { ten };
-    assert (res() == 10);
+    let t rs = { ten };
+    assert (rs() == 10);
 }
 
 fn main() { test_fn(); }

src/test/run-pass/expr-block.rs

@@ -4,13 +4,13 @@
 // -*- rust -*-
 
 // Tests for standalone blocks as expressions
-fn test_basic() { let bool res = { true }; assert (res); }
+fn test_basic() { let bool rs = { true }; assert (rs); }
 
-fn test_rec() { auto res = { rec(v1=10, v2=20) }; assert (res.v2 == 20); }
+fn test_rec() { auto rs = { rec(v1=10, v2=20) }; assert (rs.v2 == 20); }
 
 fn test_filled_with_stuff() {
-    auto res = { auto a = 0; while (a < 10) { a += 1; } a };
-    assert (res == 10);
+    auto rs = { auto a = 0; while (a < 10) { a += 1; } a };
+    assert (rs == 10);
 }
 
 fn main() { test_basic(); test_rec(); test_filled_with_stuff(); }

src/test/run-pass/expr-if-box.rs

@@ -5,13 +5,13 @@
 
 // Tests for if as expressions returning boxed types
 fn test_box() {
-    auto res = if (true) { @100 } else { @101 };
-    assert (*res == 100);
+    auto rs = if (true) { @100 } else { @101 };
+    assert (*rs == 100);
 }
 
 fn test_str() {
-    auto res = if (true) { "happy" } else { "sad" };
-    assert (res == "happy");
+    auto rs = if (true) { "happy" } else { "sad" };
+    assert (rs == "happy");
 }
 
 fn main() { test_box(); test_str(); }

src/test/run-pass/expr-if-struct.rs

@@ -5,14 +5,14 @@
 
 // Tests for if as expressions returning structural types
 fn test_rec() {
-    auto res = if (true) { rec(i=100) } else { rec(i=101) };
-    assert (res == rec(i=100));
+    auto rs = if (true) { rec(i=100) } else { rec(i=101) };
+    assert (rs == rec(i=100));
 }
 
 fn test_tag() {
     tag mood { happy; sad; }
-    auto res = if (true) { happy } else { sad };
-    assert (res == happy);
+    auto rs = if (true) { happy } else { sad };
+    assert (rs == happy);
 }
 
 fn main() { test_rec(); test_tag(); }

src/test/run-pass/expr-if.rs

@@ -5,50 +5,50 @@
 
 // Tests for if as expressions
 fn test_if() {
-    let bool res = if (true) { true } else { false };
-    assert (res);
+    let bool rs = if (true) { true } else { false };
+    assert (rs);
 }
 
 fn test_else() {
-    let bool res = if (false) { false } else { true };
-    assert (res);
+    let bool rs = if (false) { false } else { true };
+    assert (rs);
 }
 
 fn test_elseif1() {
-    let bool res = if (true) { true } else if (true) { false } else { false };
-    assert (res);
+    let bool rs = if (true) { true } else if (true) { false } else { false };
+    assert (rs);
 }
 
 fn test_elseif2() {
-    let bool res =
+    let bool rs =
         if (false) { false } else if (true) { true } else { false };
-    assert (res);
+    assert (rs);
 }
 
 fn test_elseif3() {
-    let bool res =
+    let bool rs =
         if (false) { false } else if (false) { false } else { true };
-    assert (res);
+    assert (rs);
 }
 
 fn test_inferrence() {
-    auto res = if (true) { true } else { false };
-    assert (res);
+    auto rs = if (true) { true } else { false };
+    assert (rs);
 }
 
 fn test_if_as_if_condition() {
-    auto res1 =
+    auto rs1 =
         if (if (false) { false } else { true }) { true } else { false };
-    assert (res1);
-    auto res2 =
+    assert (rs1);
+    auto rs2 =
         if (if (true) { false } else { true }) { false } else { true };
-    assert (res2);
+    assert (rs2);
 }
 
 fn test_if_as_block_result() {
-    auto res =
+    auto rs =
         if (true) { if (false) { false } else { true } } else { false };
-    assert (res);
+    assert (rs);
 }
 
 fn main() {