diff options
Diffstat (limited to 'src/libcore/dlist.rs')
| -rw-r--r-- | src/libcore/dlist.rs | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/libcore/dlist.rs b/src/libcore/dlist.rs index 1aa6c5a0197..89789a38b24 100644 --- a/src/libcore/dlist.rs +++ b/src/libcore/dlist.rs @@ -22,9 +22,7 @@ Do not use ==, !=, <, etc on doubly-linked lists -- it may not terminate. #[forbid(deprecated_mode)]; #[forbid(deprecated_pattern)]; -use kinds::Copy; use managed; -use option::{None, Option, Some}; use option; use vec; @@ -96,13 +94,13 @@ impl<T> DListNode<T> { } /// Creates a new dlist node with the given data. -pub pure fn new_dlist_node<T>(data: T) -> DListNode<T> { +pure fn new_dlist_node<T>(data: T) -> DListNode<T> { DListNode(@{data: move data, mut linked: false, mut prev: None, mut next: None}) } /// Creates a new, empty dlist. -pub pure fn DList<T>() -> DList<T> { +pure fn DList<T>() -> DList<T> { DList_(@{mut size: 0, mut hd: None, mut tl: None}) } @@ -122,7 +120,7 @@ pub fn from_vec<T: Copy>(vec: &[T]) -> DList<T> { /// Produce a list from a list of lists, leaving no elements behind in the /// input. O(number of sub-lists). -pub fn concat<T>(lists: DList<DList<T>>) -> DList<T> { +fn concat<T>(lists: DList<DList<T>>) -> DList<T> { let result = DList(); while !lists.is_empty() { result.append(lists.pop().get()); @@ -476,9 +474,7 @@ impl<T: Copy> DList<T> { mod tests { #[legacy_exports]; - use dlist::{DList, concat, from_vec, new_dlist_node}; use iter; - use option::{None, Some}; use vec; #[test] |
