---

yaml
---
r: 165742
b: refs/heads/auto
c: 8f194de
h: refs/heads/master
v: v3

Author: cuviper

[refs]

@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 9c5101542d2a4983ade627bc593e16c0bb5f23ba
+refs/heads/auto: 8f194de95d00fe540d848cc9a7d3e049ce3684ab
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libcollections/bit.rs

@@ -87,8 +87,8 @@ use std::hash;
 
 use vec::Vec;
 
-type Blocks<'a> = Cloned<Items<'a, u32>>
-type MutBlocks<'a> MutItems<'a, u32>;
+type Blocks<'a> = Cloned<Items<'a, u32>>;
+type MutBlocks<'a> = MutItems<'a, u32>;
 type MatchWords<'a> = Chain<Enumerate<Blocks<'a>>, Skip<Take<Enumerate<Repeat<u32>>>>>;
 
 // Take two BitV's, and return iterators of their words, where the shorter one
@@ -199,7 +199,7 @@ impl Bitv {
     /// Iterator over mutable refs to  the underlying blocks of data.
     fn blocks_mut(&mut self) -> MutBlocks {
         let blocks = blocks_for_bits(self.len());
-        self.storage[..blocks].iter_mut()
+        self.storage.slice_to_mut(blocks).iter_mut()
     }
 
     /// Iterator over the underlying blocks of data
@@ -336,7 +336,7 @@ impl Bitv {
         assert!(i < self.nbits);
         let w = i / u32::BITS;
         let b = i % u32::BITS;
-        self.storage.get(w).map(|block|
+        self.storage.get(w).map(|&block|
             (block & (1 << b)) != 0
         )
     }
@@ -835,10 +835,11 @@ impl Bitv {
         if self.is_empty() {
             None
         } else {
-            let ret = self[self.nbits - 1];
+            let i = self.nbits - 1;
+            let ret = self[i];
             // Second rule of Bitv Club
-            self.set(self.nbits - 1, false);
-            self.nbits -= 1;
+            self.set(i, false);
+            self.nbits = i;
             Some(ret)
         }
     }