---

yaml
---
r: 67133
b: refs/heads/master
c: fd757a8
h: refs/heads/master
i:
  67131: b3c42ad
v: v3

Author: sfackler

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 0b4d8d688240c229a4e3d51cdaa96899258a2340
+refs/heads/master: fd757a8ab0f6bc84227d1ac7a83c55e09ea9dbcf
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 18e3db7392d2d0697b7e27d6d986139960144d85
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9

trunk/src/libextra/bitv.rs

@@ -568,6 +568,7 @@ pub struct BitvIterator<'self> {
 }
 
 impl<'self> Iterator<bool> for BitvIterator<'self> {
+    #[inline]
     fn next(&mut self) -> Option<bool> {
         if self.next_idx < self.bitv.nbits {
             let idx = self.next_idx;
@@ -866,6 +867,7 @@ pub struct BitvSetIterator<'self> {
 }
 
 impl<'self> Iterator<uint> for BitvSetIterator<'self> {
+    #[inline]
     fn next(&mut self) -> Option<uint> {
         while self.next_idx < self.set.capacity() {
             let idx = self.next_idx;
@@ -1566,4 +1568,38 @@ mod tests {
             b1.union(&b2);
         }
     }
+
+    #[bench]
+    fn bench_btv_small_iter(b: &mut BenchHarness) {
+        let bitv = Bitv::new(uint::bits, false);
+        do b.iter {
+            let mut sum = 0;
+            for bitv.iter().advance |pres| {
+                sum += pres as uint;
+            }
+        }
+    }
+
+    #[bench]
+    fn bench_bitv_big_iter(b: &mut BenchHarness) {
+        let bitv = Bitv::new(BENCH_BITS, false);
+        do b.iter {
+            let mut sum = 0;
+            for bitv.iter().advance |pres| {
+                sum += pres as uint;
+            }
+        }
+    }
+
+    #[bench]
+    fn bench_bitvset_iter(b: &mut BenchHarness) {
+        let bitv = BitvSet::from_bitv(from_fn(BENCH_BITS,
+                                              |idx| {idx % 3 == 0}));
+        do b.iter {
+            let mut sum = 0;
+            for bitv.iter().advance |idx| {
+                sum += idx;
+            }
+        }
+    }
 }