---

yaml
---
r: 152387
b: refs/heads/try2
c: 1638c4b
h: refs/heads/master
i:
  152385: 304e1de
  152383: 19e9b64
v: v3

Author: rapha

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 443a1cdf949fad31c5a851be02017d09ce09f318
+refs/heads/try2: 1638c4b7496a96d1ccf53a12b916f6180e5b1f69
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/etc/licenseck.py

@@ -42,9 +42,7 @@
     "libstd/sync/spsc_queue.rs", # BSD
     "libstd/sync/mpmc_bounded_queue.rs", # BSD
     "libsync/mpsc_intrusive.rs", # BSD
-    "test/bench/shootout-fannkuch-redux.rs", # BSD
     "test/bench/shootout-meteor.rs", # BSD
-    "test/bench/shootout-regex-dna.rs", # BSD
 ]
 
 def check_license(name, contents):

branches/try2/src/libcollections/bitv.rs

@@ -18,7 +18,6 @@ use core::iter::{Enumerate, Repeat, Map, Zip};
 use core::ops;
 use core::slice;
 use core::uint;
-use std::hash;
 
 use vec::Vec;
 
@@ -35,12 +34,12 @@ fn small_mask(nbits: uint) -> uint {
 }
 
 impl SmallBitv {
-    fn new(bits: uint) -> SmallBitv {
+    pub fn new(bits: uint) -> SmallBitv {
         SmallBitv {bits: bits}
     }
 
     #[inline]
-    fn bits_op(&mut self,
+    pub fn bits_op(&mut self,
                    right_bits: uint,
                    nbits: uint,
                    f: |uint, uint| -> uint)
@@ -53,32 +52,32 @@ impl SmallBitv {
     }
 
     #[inline]
-    fn union(&mut self, s: &SmallBitv, nbits: uint) -> bool {
+    pub fn union(&mut self, s: &SmallBitv, nbits: uint) -> bool {
         self.bits_op(s.bits, nbits, |u1, u2| u1 | u2)
     }
 
     #[inline]
-    fn intersect(&mut self, s: &SmallBitv, nbits: uint) -> bool {
+    pub fn intersect(&mut self, s: &SmallBitv, nbits: uint) -> bool {
         self.bits_op(s.bits, nbits, |u1, u2| u1 & u2)
     }
 
     #[inline]
-    fn become(&mut self, s: &SmallBitv, nbits: uint) -> bool {
+    pub fn become(&mut self, s: &SmallBitv, nbits: uint) -> bool {
         self.bits_op(s.bits, nbits, |_u1, u2| u2)
     }
 
     #[inline]
-    fn difference(&mut self, s: &SmallBitv, nbits: uint) -> bool {
+    pub fn difference(&mut self, s: &SmallBitv, nbits: uint) -> bool {
         self.bits_op(s.bits, nbits, |u1, u2| u1 & !u2)
     }
 
     #[inline]
-    fn get(&self, i: uint) -> bool {
+    pub fn get(&self, i: uint) -> bool {
         (self.bits & (1 << i)) != 0
     }
 
     #[inline]
-    fn set(&mut self, i: uint, x: bool) {
+    pub fn set(&mut self, i: uint, x: bool) {
         if x {
             self.bits |= 1<<i;
         }
@@ -88,29 +87,29 @@ impl SmallBitv {
     }
 
     #[inline]
-    fn equals(&self, b: &SmallBitv, nbits: uint) -> bool {
+    pub fn equals(&self, b: &SmallBitv, nbits: uint) -> bool {
         let mask = small_mask(nbits);
         mask & self.bits == mask & b.bits
     }
 
     #[inline]
-    fn clear(&mut self) { self.bits = 0; }
+    pub fn clear(&mut self) { self.bits = 0; }
 
     #[inline]
-    fn set_all(&mut self) { self.bits = !0; }
+    pub fn set_all(&mut self) { self.bits = !0; }
 
     #[inline]
-    fn all(&self, nbits: uint) -> bool {
+    pub fn all(&self, nbits: uint) -> bool {
         small_mask(nbits) & !self.bits == 0
     }
 
     #[inline]
-    fn none(&self, nbits: uint) -> bool {
+    pub fn none(&self, nbits: uint) -> bool {
         small_mask(nbits) & self.bits == 0
     }
 
     #[inline]
-    fn negate(&mut self) { self.bits = !self.bits; }
+    pub fn negate(&mut self) { self.bits = !self.bits; }
 }
 
 #[deriving(Clone)]
@@ -135,12 +134,12 @@ fn big_mask(nbits: uint, elem: uint) -> uint {
 }
 
 impl BigBitv {
-    fn new(storage: Vec<uint>) -> BigBitv {
+    pub fn new(storage: Vec<uint>) -> BigBitv {
         BigBitv {storage: storage}
     }
 
     #[inline]
-    fn process(&mut self,
+    pub fn process(&mut self,
                    b: &BigBitv,
                    nbits: uint,
                    op: |uint, uint| -> uint)
@@ -164,45 +163,45 @@ impl BigBitv {
     }
 
     #[inline]
-    fn each_storage(&mut self, op: |v: &mut uint| -> bool) -> bool {
+    pub fn each_storage(&mut self, op: |v: &mut uint| -> bool) -> bool {
         self.storage.mut_iter().advance(|elt| op(elt))
     }
 
     #[inline]
-    fn negate(&mut self) {
+    pub fn negate(&mut self) {
         self.each_storage(|w| { *w = !*w; true });
     }
 
     #[inline]
-    fn union(&mut self, b: &BigBitv, nbits: uint) -> bool {
+    pub fn union(&mut self, b: &BigBitv, nbits: uint) -> bool {
         self.process(b, nbits, |w1, w2| w1 | w2)
     }
 
     #[inline]
-    fn intersect(&mut self, b: &BigBitv, nbits: uint) -> bool {
+    pub fn intersect(&mut self, b: &BigBitv, nbits: uint) -> bool {
         self.process(b, nbits, |w1, w2| w1 & w2)
     }
 
     #[inline]
-    fn become(&mut self, b: &BigBitv, nbits: uint) -> bool {
+    pub fn become(&mut self, b: &BigBitv, nbits: uint) -> bool {
         self.process(b, nbits, |_, w| w)
     }
 
     #[inline]
-    fn difference(&mut self, b: &BigBitv, nbits: uint) -> bool {
+    pub fn difference(&mut self, b: &BigBitv, nbits: uint) -> bool {
         self.process(b, nbits, |w1, w2| w1 & !w2)
     }
 
     #[inline]
-    fn get(&self, i: uint) -> bool {
+    pub fn get(&self, i: uint) -> bool {
         let w = i / uint::BITS;
         let b = i % uint::BITS;
         let x = 1 & self.storage.get(w) >> b;
         x == 1
     }
 
     #[inline]
-    fn set(&mut self, i: uint, x: bool) {
+    pub fn set(&mut self, i: uint, x: bool) {
         let w = i / uint::BITS;
         let b = i % uint::BITS;
         let flag = 1 << b;
@@ -211,7 +210,7 @@ impl BigBitv {
     }
 
     #[inline]
-    fn equals(&self, b: &BigBitv, nbits: uint) -> bool {
+    pub fn equals(&self, b: &BigBitv, nbits: uint) -> bool {
         for (i, elt) in b.storage.iter().enumerate() {
             let mask = big_mask(nbits, i);
             if mask & *self.storage.get(i) != mask & *elt {
@@ -597,20 +596,6 @@ impl fmt::Show for Bitv {
     }
 }
 
-impl<S: hash::Writer> hash::Hash<S> for Bitv {
-    fn hash(&self, state: &mut S) {
-        self.nbits.hash(state);
-        match self.rep {
-            Small(ref s) => (s.bits & small_mask(self.nbits)).hash(state),
-            Big(ref b) => {
-                for (i, ele) in b.storage.iter().enumerate() {
-                    (ele & big_mask(self.nbits, i)).hash(state);
-                }
-            }
-        }
-    }
-}
-
 #[inline]
 fn iterate_bits(base: uint, bits: uint, f: |uint| -> bool) -> bool {
     if bits == 0 {
@@ -849,14 +834,6 @@ impl fmt::Show for BitvSet {
     }
 }
 
-impl<S: hash::Writer> hash::Hash<S> for BitvSet {
-    fn hash(&self, state: &mut S) {
-        for pos in self.iter() {
-            pos.hash(state);
-        }
-    }
-}
-
 impl Container for BitvSet {
     #[inline]
     fn len(&self) -> uint { self.size }

branches/try2/src/libcollections/vec.rs

@@ -1532,7 +1532,7 @@ impl<T> FromVec<T> for ~[T] {
 
         // In a post-DST world, we can attempt to reuse the Vec allocation by calling
         // shrink_to_fit() on it. That may involve a reallocation+memcpy, but that's no
-        // different than what we're doing manually here.
+        // diffrent than what we're doing manually here.
 
         let vp = v.as_mut_ptr();
 

branches/try2/src/libcore/simd.rs

@@ -31,7 +31,7 @@
 //!
 //! ## Stability Note
 //!
-//! These are all experimental. The interface may change entirely, without
+//! These are all experimental. The inferface may change entirely, without
 //! warning.
 
 #![allow(non_camel_case_types)]

branches/try2/src/libcore/str.rs

@@ -478,7 +478,7 @@ impl TwoWaySearcher {
 }
 
 /// The internal state of an iterator that searches for matches of a substring
-/// within a larger string using a dynamically chosen search algorithm
+/// within a larger string using a dynamically chosed search algorithm
 #[deriving(Clone)]
 enum Searcher {
     Naive(NaiveSearcher),
@@ -1120,7 +1120,7 @@ pub trait StrSlice<'a> {
     ///
     /// That is, each returned value `(start, end)` satisfies
     /// `self.slice(start, end) == sep`. For matches of `sep` within
-    /// `self` that overlap, only the indices corresponding to the
+    /// `self` that overlap, only the indicies corresponding to the
     /// first match are returned.
     ///
     /// # Example

branches/try2/src/librustc/middle/lang_items.rs

@@ -187,11 +187,11 @@ impl<'a> LanguageItemCollector<'a> {
 
 pub fn extract(attrs: &[ast::Attribute]) -> Option<InternedString> {
     for attribute in attrs.iter() {
-        match attribute.value_str() {
-            Some(ref value) if attribute.check_name("lang") => {
-                return Some(value.clone());
+        match attribute.name_str_pair() {
+            Some((ref key, ref value)) if key.equiv(&("lang")) => {
+                return Some((*value).clone());
             }
-            _ => {}
+            Some(..) | None => {}
         }
     }