---

yaml
---
r: 48755
b: refs/heads/snap-stage3
c: 471d2b1
h: refs/heads/master
i:
  48753: baef2ba
  48751: b074b1d
v: v3

Author: luqmana

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 3bbcac322669cff3abde5be937cc4ec3860f3985
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: d856215b925441a4889cb23cab5758c36e4a4746
+refs/heads/snap-stage3: 471d2b17657bdaea357faeaa3e857f8a758bfbe3
 refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libcore/rt/thread_local_storage.rs

@@ -40,6 +40,7 @@ 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/snap-stage3/src/libcore/trie.rs

@@ -137,7 +137,6 @@ 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}
@@ -192,12 +191,6 @@ 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 {
@@ -272,8 +265,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 sh = uint::bits - (SHIFT * (idx + 1));
-    (n >> sh) & MASK
+    let real_idx = uint::bytes - 1 - idx;
+    (n >> (SHIFT * real_idx)) & MASK
 }
 
 fn insert<T>(count: &mut uint, child: &mut Child<T>, key: uint, value: T,
@@ -469,26 +462,4 @@ 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/snap-stage3/src/librustc/middle/ty.rs

@@ -3102,7 +3102,6 @@ pub fn expr_kind(tcx: ctxt,
         ast::expr_block(*) |
         ast::expr_copy(*) |
         ast::expr_repeat(*) |
-        ast::expr_inline_asm(*) |
         ast::expr_lit(@codemap::spanned {node: lit_str(_), _}) |
         ast::expr_vstore(_, ast::expr_vstore_slice) |
         ast::expr_vstore(_, ast::expr_vstore_mut_slice) |
@@ -3145,6 +3144,7 @@ pub fn expr_kind(tcx: ctxt,
         ast::expr_loop(*) |
         ast::expr_assign(*) |
         ast::expr_swap(*) |
+        ast::expr_inline_asm(*) |
         ast::expr_assign_op(*) => {
             RvalueStmtExpr
         }