---

yaml
---
r: 50414
b: refs/heads/auto
c: 258a367
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: 8e30d3fc0bad3bac9f5f1fc2b925aa831aca8ff8
+refs/heads/auto: 258a36738e6dcba1b01609e026862aa9750ccdbd
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167

branches/auto/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/auto/src/libcore/dlist.rs renamed to branches/auto/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/auto/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/auto/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