about summary refs log tree commit diff
path: root/src/libcore
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2012-09-09 16:53:19 -0700
committerBrian Anderson <banderson@mozilla.com>2012-09-09 16:53:19 -0700
commitf53c2948aa6bd0ffc47527e977cb278d48467a75 (patch)
treefb6899e415cf8ebee8d9f12bae2fd74600e6c146 /src/libcore
parent9007afab0aa27c469dc837d4244281a0f24a0769 (diff)
Rename variables that clash with keywords
Diffstat (limited to 'src/libcore')
-rw-r--r--src/libcore/comm.rs6
-rw-r--r--src/libcore/vec.rs6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/libcore/comm.rs b/src/libcore/comm.rs
index 177ecdca9a2..5dfafb85bbd 100644
--- a/src/libcore/comm.rs
+++ b/src/libcore/comm.rs
@@ -420,17 +420,17 @@ fn test_select2_stress() {
         };
     }
 
-    let mut as = 0;
+    let mut as_ = 0;
     let mut bs = 0;
     for iter::repeat(msgs * times * 2u) {
         match select2(po_a, po_b) {
-          either::Left(~"a") => as += 1,
+          either::Left(~"a") => as_ += 1,
           either::Right(~"b") => bs += 1,
           _ => fail ~"test_select_2_stress failed"
         }
     }
 
-    assert as == 400;
+    assert as_ == 400;
     assert bs == 400;
 }
 
diff --git a/src/libcore/vec.rs b/src/libcore/vec.rs
index 2ae6a7b2780..746544a6afd 100644
--- a/src/libcore/vec.rs
+++ b/src/libcore/vec.rs
@@ -1029,15 +1029,15 @@ pure fn rposition_between<T>(v: &[T], start: uint, end: uint,
  * Convert a vector of pairs into a pair of vectors, by reference. As unzip().
  */
 pure fn unzip_slice<T: Copy, U: Copy>(v: &[(T, U)]) -> (~[T], ~[U]) {
-    let mut as = ~[], bs = ~[];
+    let mut as_ = ~[], bs = ~[];
     for each(v) |p| {
         let (a, b) = p;
         unchecked {
-            vec::push(as, a);
+            vec::push(as_, a);
             vec::push(bs, b);
         }
     }
-    return (as, bs);
+    return (as_, bs);
 }
 
 /**