---

yaml
---
r: 42489
b: refs/heads/try
c: 95d25ca
h: refs/heads/master
i:
  42487: 75b0f36
v: v3

Author: alexcrichton

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 19dfec2aaf746535de1521f68421f9980dbf25de
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
-refs/heads/try: 96b4f436753ac40211035b533f0e0c88858ff72d
+refs/heads/try: 95d25ca47c0afe8c72bf16777ed266c4e033c54e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/src/librustc/middle/region.rs

@@ -622,7 +622,7 @@ fn determine_rp_in_ty(ty: @ast::Ty,
                       &&cx: determine_rp_ctxt,
                       visitor: visit::vt<determine_rp_ctxt>) {
 
-    // we are only interested in types that will require an item to
+    // we are only interesting in types that will require an item to
     // be region-parameterized.  if cx.item_id is zero, then this type
     // is not a member of a type defn nor is it a constitutent of an
     // impl etc.  So we can ignore it and its components.

branches/try/src/librustc/util/ppaux.rs

@@ -82,9 +82,6 @@ fn explain_region_and_span(cx: ctxt, region: ty::Region)
               _ => explain_span(cx, "expression", expr.span)
             }
           }
-          Some(ast_map::node_stmt(stmt)) => {
-              explain_span(cx, "statement", stmt.span)
-          }
           Some(_) | None => {
             // this really should not happen
             (fmt!("unknown scope: %d.  Please report a bug.", node_id),

branches/try/src/libstd/bitv.rs

@@ -59,7 +59,7 @@ impl SmallBitv {
 
     #[inline(always)]
     fn difference(s: &SmallBitv, nbits: uint) -> bool {
-        self.bits_op(s.bits, nbits, |u1, u2| u1 ^ u2)
+        self.bits_op(s.bits, nbits, |u1, u2| u1 & !u2)
     }
 
     #[inline(always)]
@@ -180,10 +180,7 @@ impl BigBitv {
 
     #[inline(always)]
     fn difference(b: &BigBitv, nbits: uint) -> bool {
-        self.invert();
-        let b = self.intersect(b, nbits);
-        self.invert();
-        b
+        self.process(b, nbits, difference)
     }
 
     #[inline(always)]
@@ -567,6 +564,8 @@ 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 Bitv: ops::Index<uint,bool> {
@@ -954,6 +953,34 @@ mod tests {
         let bools = ~[false, false, true, false, false, true, true, false];
         assert from_bytes([0b00100110]).to_bools() == bools;
     }
+
+    #[test]
+    fn test_small_difference() {
+      let b1 = Bitv(3, false);
+      let b2 = Bitv(3, false);
+      b1.set(0, true);
+      b1.set(1, true);
+      b2.set(1, true);
+      b2.set(2, true);
+      assert b1.difference(&b2);
+      assert b1[0];
+      assert !b1[1];
+      assert !b1[2];
+    }
+
+    #[test]
+    fn test_big_difference() {
+      let b1 = Bitv(100, false);
+      let b2 = Bitv(100, false);
+      b1.set(0, true);
+      b1.set(40, true);
+      b2.set(40, true);
+      b2.set(80, true);
+      assert b1.difference(&b2);
+      assert b1[0];
+      assert !b1[40];
+      assert !b1[80];
+    }
 }
 
 //