---

yaml
---
r: 44147
b: refs/heads/snap-stage3
c: 393a4b4
h: refs/heads/master
i:
  44145: b092f77
  44143: 4f6acf8
v: v3

Author: alexcrichton

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 19dfec2aaf746535de1521f68421f9980dbf25de
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: dc7e6abab78124ffdec7568afe5297eded1f1966
+refs/heads/snap-stage3: 393a4b41f60612f234394b58b8e3bf3261ca9566
 refs/heads/try: ef355f6332f83371e4acf04fc4eb940ab41d78d3
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libstd/bitv.rs

@@ -164,22 +164,22 @@ impl BigBitv {
 
     #[inline(always)]
     fn union(&mut self, b: &BigBitv, nbits: uint) -> bool {
-        self.process(b, nbits, lor)
+        self.process(b, nbits, |w1, w2| w1 | w2)
     }
 
     #[inline(always)]
     fn intersect(&mut self, b: &BigBitv, nbits: uint) -> bool {
-        self.process(b, nbits, land)
+        self.process(b, nbits, |w1, w2| w1 & w2)
     }
 
     #[inline(always)]
     fn become(&mut self, b: &BigBitv, nbits: uint) -> bool {
-        self.process(b, nbits, right)
+        self.process(b, nbits, |_, w| w)
     }
 
     #[inline(always)]
     fn difference(&mut self, b: &BigBitv, nbits: uint) -> bool {
-        self.process(b, nbits, difference)
+        self.process(b, nbits, |w1, w2| w1 & !w2)
     }
 
     #[inline(always)]
@@ -556,13 +556,9 @@ pub fn from_fn(len: uint, f: fn(index: uint) -> bool) -> Bitv {
     bitv
 }
 
-pure fn lor(w0: uint, w1: uint) -> uint { return w0 | w1; }
 
-pure fn land(w0: uint, w1: uint) -> uint { return w0 & w1; }
 
-pure fn difference(w0: uint, w1: uint) -> uint { return w0 & !w1; }
 
-pure fn right(_w0: uint, w1: uint) -> uint { return w1; }
 
 impl ops::Index<uint,bool> for Bitv {
     pure fn index(&self, i: uint) -> bool {