---

yaml
---
r: 51171
b: refs/heads/try
c: 042a665
h: refs/heads/master
i:
  51169: 0c75305
  51167: 356ad95
v: v3

Author: bors

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 5f13e9ccc2e3328d4cd8ca49f84e6840dd998346
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: f7a2371c176663d59062ec5158f39faecba45768
-refs/heads/try: 74d20b46c5aac5c7f058ae33aa5c59fd03dfa88b
+refs/heads/try: 042a66514d9e8e373d95e8027187d86bb3418cef
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libcore/core.rc

@@ -189,7 +189,6 @@ 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/try/src/libcore/dlist.rs renamed to branches/try/src/libstd/dlist.rs

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

branches/try/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/try/src/libstd/std.rc

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