---

yaml
---
r: 54425
b: refs/heads/snap-stage3
c: 02700e0
h: refs/heads/master
i:
  54423: 3b83e1d
v: v3

Author: luqmana

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 5f13e9ccc2e3328d4cd8ca49f84e6840dd998346
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 258a36738e6dcba1b01609e026862aa9750ccdbd
+refs/heads/snap-stage3: 02700e0e8d77ce7cd0e606088cdc17b293a00fd6
 refs/heads/try: 8eb2bab100b42f0ba751552d8eff00eb2134c55a
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libcore/core.rc

@@ -189,6 +189,7 @@ pub mod container;
 pub mod option;
 pub mod result;
 pub mod either;
+pub mod dlist;
 pub mod hashmap;
 pub mod cell;
 pub mod trie;

branches/snap-stage3/src/libstd/dlist.rs renamed to branches/snap-stage3/src/libcore/dlist.rs

@@ -18,8 +18,12 @@ Do not use ==, !=, <, etc on doubly-linked lists -- it may not terminate.
 
 */
 
-use core::prelude::*;
-use core::managed;
+use iter;
+use iter::BaseIter;
+use kinds::Copy;
+use managed;
+use option::{None, Option, Some};
+use vec;
 
 pub type DListLink<T> = Option<@mut DListNode<T>>;
 
@@ -536,8 +540,10 @@ impl<T> BaseIter<T> for @mut DList<T> {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
-    use core::prelude::*;
+    use dlist::{DList, concat, from_vec, new_dlist_node};
+    use iter;
+    use option::{None, Some};
+    use vec;
 
     #[test]
     pub fn test_dlist_concat() {

branches/snap-stage3/src/libstd/serialize.rs

@@ -17,10 +17,10 @@ Core encoding and decoding interfaces.
 #[forbid(non_camel_case_types)];
 
 use core::prelude::*;
+use core::dlist::DList;
 use core::hashmap::linear::{LinearMap, LinearSet};
 use core::trie::{TrieMap, TrieSet};
 use deque::Deque;
-use dlist::DList;
 use treemap::{TreeMap, TreeSet};
 
 pub trait Encoder {

branches/snap-stage3/src/libstd/std.rc

@@ -75,7 +75,6 @@ pub mod priority_queue;
 pub mod rope;
 pub mod smallintmap;
 pub mod sort;
-pub mod dlist;
 pub mod treemap;
 
 // And ... other stuff

branches/snap-stage3/src/libsyntax/abi.rs

@@ -40,11 +40,8 @@ pub enum Architecture {
     Mips
 }
 
-// FIXME(#5423) After a snapshot, we can change these constants:
-// const IntelBits: u32 = (1 << (X86 as uint)) | (1 << X86_64 as uint));
-// const ArmBits: u32 = (1 << (Arm as uint));
-static IntelBits: u32 = 1 | 2;
-static ArmBits: u32 = 4;
+static IntelBits: u32 = (1 << (X86 as uint)) | (1 << (X86_64 as uint));
+static ArmBits: u32 = (1 << (Arm as uint));
 
 struct AbiData {
     abi: Abi,