---

yaml
---
r: 47765
b: refs/heads/incoming
c: 393a4b4
h: refs/heads/master
i:
  47763: 301b852
v: v3

Author: alexcrichton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/incoming: dc7e6abab78124ffdec7568afe5297eded1f1966
+refs/heads/incoming: 393a4b41f60612f234394b58b8e3bf3261ca9566
 refs/heads/dist-snap: 8b98e5a296d95c5e832db0756828e5bec31c6f50
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/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 {