Skip to content

Commit

Permalink
move dlist from core -> std
Browse files Browse the repository at this point in the history
Closes #3549
  • Loading branch information
thestinger committed Mar 31, 2013
1 parent 8e30d3f commit 258a367
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 12 deletions.
1 change: 0 additions & 1 deletion src/libcore/core.rc
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
14 changes: 4 additions & 10 deletions src/libcore/dlist.rs → src/libstd/dlist.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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>>;

Expand Down Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/serialize.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions src/libstd/std.rc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

11 comments on commit 258a367

@bors
Copy link
Contributor

@bors bors commented on 258a367 Mar 31, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 258a367 Mar 31, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging thestinger/rust/dlist = 258a367 into auto

@bors
Copy link
Contributor

@bors bors commented on 258a367 Mar 31, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging thestinger/rust/dlist = 258a367 into auto failed

@bors
Copy link
Contributor

@bors bors commented on 258a367 Mar 31, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 258a367 Mar 31, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging thestinger/rust/dlist = 258a367 into auto

@bors
Copy link
Contributor

@bors bors commented on 258a367 Mar 31, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thestinger/rust/dlist = 258a367 merged ok, testing candidate = 686de575

@bors
Copy link
Contributor

@bors bors commented on 258a367 Mar 31, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 258a367 Mar 31, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging thestinger/rust/dlist = 258a367 into auto

@bors
Copy link
Contributor

@bors bors commented on 258a367 Mar 31, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thestinger/rust/dlist = 258a367 merged ok, testing candidate = bd7ba1f

@bors
Copy link
Contributor

@bors bors commented on 258a367 Mar 31, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 258a367 Mar 31, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding incoming to auto = bd7ba1f

Please sign in to comment.