about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorDaniel Micay <danielmicay@gmail.com>2013-03-30 16:15:46 -0400
committerDaniel Micay <danielmicay@gmail.com>2013-03-30 21:06:26 -0400
commit258a36738e6dcba1b01609e026862aa9750ccdbd (patch)
tree0fbeeb24ee1d644875fb559127abee879aa44502 /src
parent8e30d3fc0bad3bac9f5f1fc2b925aa831aca8ff8 (diff)
downloadrust-258a36738e6dcba1b01609e026862aa9750ccdbd.tar.gz
rust-258a36738e6dcba1b01609e026862aa9750ccdbd.zip
move dlist from core -> std
Closes #3549
Diffstat (limited to 'src')
-rw-r--r--src/libcore/core.rc1
-rw-r--r--src/libstd/dlist.rs (renamed from src/libcore/dlist.rs)14
-rw-r--r--src/libstd/serialize.rs2
-rw-r--r--src/libstd/std.rc1
4 files changed, 6 insertions, 12 deletions
diff --git a/src/libcore/core.rc b/src/libcore/core.rc
index 4d91e8f2993..443f2538fa9 100644
--- a/src/libcore/core.rc
+++ b/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;
diff --git a/src/libcore/dlist.rs b/src/libstd/dlist.rs
index ee7c1651514..e7701974097 100644
--- a/src/libcore/dlist.rs
+++ b/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() {
diff --git a/src/libstd/serialize.rs b/src/libstd/serialize.rs
index 72c81d6d6b4..ddc84e07a35 100644
--- a/src/libstd/serialize.rs
+++ b/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 {
diff --git a/src/libstd/std.rc b/src/libstd/std.rc
index b28e2f0ab6d..89bdc750c22 100644
--- a/src/libstd/std.rc
+++ b/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