about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-02-06 23:46:35 -0800
committerbors <bors@rust-lang.org>2014-02-06 23:46:35 -0800
commit21b856d2dc6ae2e4b40c73958d34501358707b39 (patch)
treedd1fbf7ef6abe8b987b09a98b33d2c27924ebd10 /src/libsyntax
parent55f53f553a04fa0e491f96891403f40aeeed0665 (diff)
parentd81bb441dae3bdb6760dcb0dc0fca2aceb561d24 (diff)
downloadrust-21b856d2dc6ae2e4b40c73958d34501358707b39.tar.gz
rust-21b856d2dc6ae2e4b40c73958d34501358707b39.zip
auto merge of #12010 : HeroesGrave/rust/libcollection, r=alexcrichton
Part of #8784

Changes:
- Everything labeled under collections in libextra has been moved into a new crate 'libcollection'.
- Renamed container.rs to deque.rs, since it was no longer 'container traits for extra', just a deque trait.
- Crates that depend on the collections have been updated and dependencies sorted.
- I think I changed all the imports in the tests to make sure it works. I'm not entirely sure, as near the end of the tests there was yet another `use` that I forgot to change, and when I went to try again, it started rebuilding everything, which I don't currently have time for. 

There will probably be incompatibility between this and the other pull requests that are splitting up libextra. I'm happy to rebase once those have been merged.

The tests I didn't get to run should pass. But I can redo them another time if they don't.
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/ast_map.rs2
-rw-r--r--src/libsyntax/lib.rs1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/libsyntax/ast_map.rs b/src/libsyntax/ast_map.rs
index 89209ab2104..817668f2232 100644
--- a/src/libsyntax/ast_map.rs
+++ b/src/libsyntax/ast_map.rs
@@ -22,7 +22,7 @@ use util::small_vector::SmallVector;
 
 use std::logging;
 use std::cell::RefCell;
-use extra::smallintmap::SmallIntMap;
+use collections::SmallIntMap;
 
 #[deriving(Clone, Eq)]
 pub enum PathElem {
diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs
index 3f305a4eb0e..613416bed1c 100644
--- a/src/libsyntax/lib.rs
+++ b/src/libsyntax/lib.rs
@@ -35,6 +35,7 @@ This API is completely unstable and subject to change.
 extern mod extra;
 extern mod serialize;
 extern mod term;
+extern mod collections;
 
 pub mod util {
     pub mod interner;