---

yaml
---
r: 49962
b: refs/heads/auto
c: d856215
h: refs/heads/master
v: v3

Author: thestinger

[refs]

@@ -14,5 +14,5 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 5a77a1048897a12c9031d3e0b3867f0c6e3673ea
+refs/heads/auto: d856215b925441a4889cb23cab5758c36e4a4746
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167

branches/auto/src/libcore/rt/thread_local_storage.rs

@@ -40,7 +40,6 @@ type pthread_key_t = c_ulong;
 
 #[cfg(target_os="linux")]
 #[cfg(target_os="freebsd")]
-#[cfg(target_os="android")]
 #[allow(non_camel_case_types)] // foreign type
 type pthread_key_t = c_uint;
 

branches/auto/src/libcore/trie.rs

@@ -137,6 +137,7 @@ impl<T> Map<uint, T> for TrieMap<T> {
 }
 
 impl<T> TrieMap<T> {
+    /// Create an empty TrieMap
     #[inline(always)]
     static pure fn new() -> TrieMap<T> {
         TrieMap{root: TrieNode::new(), length: 0}
@@ -191,6 +192,12 @@ impl Mutable for TrieSet {
 }
 
 impl TrieSet {
+    /// Create an empty TrieSet
+    #[inline(always)]
+    static pure fn new() -> TrieSet {
+        TrieSet{map: TrieMap::new()}
+    }
+
     /// Return true if the set contains a value
     #[inline(always)]
     pure fn contains(&self, value: &uint) -> bool {
@@ -265,8 +272,8 @@ impl<T> TrieNode<T> {
 // if this was done via a trait, the key could be generic
 #[inline(always)]
 pure fn chunk(n: uint, idx: uint) -> uint {
-    let real_idx = uint::bytes - 1 - idx;
-    (n >> (SHIFT * real_idx)) & MASK
+    let sh = uint::bits - (SHIFT * (idx + 1));
+    (n >> sh) & MASK
 }
 
 fn insert<T>(count: &mut uint, child: &mut Child<T>, key: uint, value: T,
@@ -462,4 +469,26 @@ mod tests {
             n -= 1;
         }
     }
+
+    #[test]
+    fn test_sane_chunk() {
+        let x = 1;
+        let y = 1 << (uint::bits - 1);
+
+        let mut trie = TrieSet::new();
+
+        fail_unless!(trie.insert(x));
+        fail_unless!(trie.insert(y));
+
+        fail_unless!(trie.len() == 2);
+
+        let expected = [x, y];
+
+        let mut i = 0;
+
+        for trie.each |x| {
+            fail_unless!(expected[i] == *x);
+            i += 1;
+        }
+    }
 }

branches/auto/src/libstd/deque.rs

@@ -22,61 +22,40 @@ pub struct Deque<T> {
 }
 
 impl<T> Container for Deque<T> {
-    /// Return the number of elements in the deque
     pure fn len(&self) -> uint { self.nelts }
-
-    /// Return true if the deque contains no elements
     pure fn is_empty(&self) -> bool { self.len() == 0 }
 }
 
 impl<T> Mutable for Deque<T> {
-    /// Clear the deque, removing all values.
     fn clear(&mut self) {
-        for self.elts.each_mut |x| { *x = None }
+        for vec::each_mut(self.elts) |x| { *x = None }
         self.nelts = 0;
         self.lo = 0;
         self.hi = 0;
     }
 }
 
 pub impl<T> Deque<T> {
-    /// Create an empty Deque
     static pure fn new() -> Deque<T> {
         Deque{nelts: 0, lo: 0, hi: 0,
               elts: vec::from_fn(initial_capacity, |_| None)}
     }
 
-    /// Return a reference to the first element in the deque
-    ///
-    /// Fails if the deque is empty
     fn peek_front(&self) -> &self/T { get(self.elts, self.lo) }
-
-    /// Return a reference to the last element in the deque
-    ///
-    /// Fails if the deque is empty
     fn peek_back(&self) -> &self/T { get(self.elts, self.hi - 1u) }
 
-    /// Retrieve an element in the deque by index
-    ///
-    /// Fails if there is no element with the given index
     fn get(&self, i: int) -> &self/T {
         let idx = (self.lo + (i as uint)) % self.elts.len();
         get(self.elts, idx)
     }
 
-    /// Remove and return the first element in the deque
-    ///
-    /// Fails if the deque is empty
     fn pop_front(&mut self) -> T {
         let mut result = self.elts[self.lo].swap_unwrap();
         self.lo = (self.lo + 1u) % self.elts.len();
         self.nelts -= 1u;
         result
     }
 
-    /// Remove and return the last element in the deque
-    ///
-    /// Fails if the deque is empty
     fn pop_back(&mut self) -> T {
         if self.hi == 0u {
             self.hi = self.elts.len() - 1u;
@@ -87,7 +66,6 @@ pub impl<T> Deque<T> {
         result
     }
 
-    /// Prepend an element to the deque
     fn add_front(&mut self, t: T) {
         let oldlo = self.lo;
         if self.lo == 0u {
@@ -102,7 +80,6 @@ pub impl<T> Deque<T> {
         self.nelts += 1u;
     }
 
-    /// Append an element to the deque
     fn add_back(&mut self, t: T) {
         if self.lo == self.hi && self.nelts != 0u {
             self.elts = grow(self.nelts, self.lo, self.elts);

branches/auto/src/libstd/treemap.rs

@@ -636,13 +636,14 @@ fn remove<K: TotalOrd, V>(node: &mut Option<~TreeNode<K, V>>,
     fn heir_swap<K: TotalOrd, V>(node: &mut ~TreeNode<K, V>,
                             child: &mut Option<~TreeNode<K, V>>) {
         // *could* be done without recursion, but it won't borrow check
-        for child.each_mut |x| {
-            if x.right.is_some() {
-                heir_swap(node, &mut x.right);
+        do child.mutate |mut child| {
+            if child.right.is_some() {
+                heir_swap(node, &mut child.right);
             } else {
-                node.key <-> x.key;
-                node.value <-> x.value;
+                node.key <-> child.key;
+                node.value <-> child.value;
             }
+            child
         }
     }
 
@@ -688,7 +689,7 @@ fn remove<K: TotalOrd, V>(node: &mut Option<~TreeNode<K, V>>,
                 save.level -= 1;
 
                 if right_level > save.level {
-                    for save.right.each_mut |x| { x.level = save.level }
+                    do save.right.mutate |mut x| { x.level = save.level; x }
                 }
 
                 skew(save);
@@ -987,6 +988,8 @@ mod test_treemap {
         let m = m;
         let mut a = m.iter();
 
+        // FIXME: #4492 (ICE): iter.get() == Some((&x1, &y1))
+
         fail_unless!(map_next(&mut a).unwrap() == (&x1, &y1));
         fail_unless!(map_next(&mut a).unwrap() == (&x2, &y2));
         fail_unless!(map_next(&mut a).unwrap() == (&x3, &y3));