about summary refs log tree commit diff
path: root/src/comp
diff options
context:
space:
mode:
authorMarijn Haverbeke <marijnh@gmail.com>2011-06-25 17:45:49 +0200
committerMarijn Haverbeke <marijnh@gmail.com>2011-06-25 21:15:04 +0200
commit781a265b88f7fc3c8c406b327e8a548e742d6224 (patch)
tree408b0932c9b68240c0cc0bfc9066393ee2c6dd38 /src/comp
parentc772269f08c1ad1467f282d3c95e72b579aecf80 (diff)
downloadrust-781a265b88f7fc3c8c406b327e8a548e742d6224.tar.gz
rust-781a265b88f7fc3c8c406b327e8a548e742d6224.zip
Remove variable name 'res' from test suite
Diffstat (limited to 'src/comp')
-rw-r--r--src/comp/middle/tstate/states.rs6
-rw-r--r--src/comp/middle/tstate/tritv.rs6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/comp/middle/tstate/states.rs b/src/comp/middle/tstate/states.rs
index 673186e4415..8af52ed83a0 100644
--- a/src/comp/middle/tstate/states.rs
+++ b/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;
diff --git a/src/comp/middle/tstate/tritv.rs b/src/comp/middle/tstate/tritv.rs
index aa7ee64b395..88bc74772b4 100644
--- a/src/comp/middle/tstate/tritv.rs
+++ b/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;
 }
 
 //