---

yaml
---
r: 122847
b: refs/heads/master
c: da0d4be
h: refs/heads/master
i:
  122845: 0428c5f
  122843: 315aa11
  122839: 1142ab8
  122831: c2173c3
  122815: 0c80265
v: v3

Author: apoelstra

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 7a7ae993ce694bf75a11632b394916e055a4d8ec
+refs/heads/master: da0d4be378d289e9e90a48deec674d42205ae4c9
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: aaff4e05e19b48d81e4ecb3337f288f42d06edd0
 refs/heads/try: 2e9d9477b848cec778ca3f07ecdf0aea6ade23de

trunk/src/libcollections/bitv.rs

@@ -268,15 +268,6 @@ impl Bitv {
         !self.none()
     }
 
-    /**
-     * Converts `self` to a vector of `uint` with the same length.
-     *
-     * Each `uint` in the resulting vector has either value `0u` or `1u`.
-     */
-    pub fn to_vec(&self) -> Vec<uint> {
-        Vec::from_fn(self.nbits, |i| if self.get(i) { 1 } else { 0 })
-    }
-
     /**
      * Organise the bits into bytes, such that the first bit in the
      * `Bitv` becomes the high-order bit of the first byte. If the
@@ -307,13 +298,6 @@ impl Bitv {
         )
     }
 
-    /**
-     * Transform `self` into a `Vec<bool>` by turning each bit into a `bool`.
-     */
-    pub fn to_bools(&self) -> Vec<bool> {
-        Vec::from_fn(self.nbits, |i| self[i])
-    }
-
     /**
      * Compare a bitvector to a vector of `bool`.
      *
@@ -328,11 +312,6 @@ impl Bitv {
         }
         true
     }
-
-    pub fn ones(&self, f: |uint| -> bool) -> bool {
-        range(0u, self.nbits).advance(|i| !self.get(i) || f(i))
-    }
-
 }
 
 /**
@@ -1157,7 +1136,7 @@ mod tests {
     #[test]
     fn test_to_bools() {
         let bools = vec!(false, false, true, false, false, true, true, false);
-        assert_eq!(from_bytes([0b00100110]).to_bools(), bools);
+        assert_eq!(from_bytes([0b00100110]).iter().collect::<Vec<bool>>(), bools);
     }
 
     #[test]
@@ -1225,7 +1204,7 @@ mod tests {
     fn test_small_clear() {
         let mut b = Bitv::new(14, true);
         b.clear();
-        b.ones(|i| {
+        BitvSet::from_bitv(b).iter().advance(|i| {
             fail!("found 1 at {:?}", i)
         });
     }
@@ -1234,7 +1213,7 @@ mod tests {
     fn test_big_clear() {
         let mut b = Bitv::new(140, true);
         b.clear();
-        b.ones(|i| {
+        BitvSet::from_bitv(b).iter().advance(|i| {
             fail!("found 1 at {:?}", i)
         });
     }