about summary refs log tree commit diff
path: root/src/comp/middle/ty.rs
diff options
context:
space:
mode:
authorMarijn Haverbeke <marijnh@gmail.com>2011-06-24 19:04:08 +0200
committerMarijn Haverbeke <marijnh@gmail.com>2011-06-24 21:22:23 +0200
commit9643aedb049a84965ea4ac2be906ff2707d5de10 (patch)
tree3bf8252710630d05a36900226834f050dc7272f7 /src/comp/middle/ty.rs
parentd507d5fe91ce2708e4278c8bd100932c89b5e254 (diff)
downloadrust-9643aedb049a84965ea4ac2be906ff2707d5de10.tar.gz
rust-9643aedb049a84965ea4ac2be906ff2707d5de10.zip
Remove uses of variable name 'res' from rustc
This in preparation of making 'res' a keyword for defining resources.
Please don't introduce too many new ones in the meantime...
Diffstat (limited to 'src/comp/middle/ty.rs')
-rw-r--r--src/comp/middle/ty.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/comp/middle/ty.rs b/src/comp/middle/ty.rs
index 5ae8ac1d781..de36d441838 100644
--- a/src/comp/middle/ty.rs
+++ b/src/comp/middle/ty.rs
@@ -1956,7 +1956,7 @@ mod unify {
                     case (ures_ok(?unified_type)) {
                         result_type = unified_type;
                     }
-                    case (?res) { ret res; }
+                    case (?rs) { ret rs; }
                 }
             }
             case (none) {/* fall through */ }
@@ -2179,7 +2179,7 @@ mod unify {
                         // Just bind the type variable to the expected type.
                         alt (record_var_binding(cx, actual_id, expected)) {
                             case (ures_ok(_)) {/* fall through */ }
-                            case (?res) { ret res; }
+                            case (?rs) { ret rs; }
                         }
                     }
                 }
@@ -2193,7 +2193,7 @@ mod unify {
 
                 alt (record_var_binding(cx, expected_id, actual)) {
                     case (ures_ok(_)) {/* fall through */ }
-                    case (?res) { ret res; }
+                    case (?rs) { ret rs; }
                 }
                 ret ures_ok(mk_var(cx.tcx, expected_id));
             }