auto merge of #12415 : HeroesGrave/rust/move-enum-set, r=alexcrichton

Part of #8784

Also removed the one glob import.

4 files changed, 4 insertions, 3 deletions

diff --git a/src/libextra/enum_set.rs b/src/libcollections/enum_set.rs
index d036f2c70d7..94d378b9dc4 100644
--- a/src/libextra/enum_set.rs
+++ b/src/libcollections/enum_set.rs
@@ -139,7 +139,7 @@ mod test {
 
     use std::cast;
 
-    use enum_set::*;
+    use enum_set::{EnumSet, CLike};
 
     #[deriving(Eq)]
     #[repr(uint)]
diff --git a/src/libcollections/lib.rs b/src/libcollections/lib.rs
index 5b9ded3d1c7..e3413adfe91 100644
--- a/src/libcollections/lib.rs
+++ b/src/libcollections/lib.rs
@@ -26,6 +26,7 @@ pub use bitv::Bitv;
 pub use btree::BTree;
 pub use deque::Deque;
 pub use dlist::DList;
+pub use enum_set::EnumSet;
 pub use list::List;
 pub use lru_cache::LruCache;
 pub use priority_queue::PriorityQueue;
@@ -37,6 +38,7 @@ pub mod bitv;
 pub mod btree;
 pub mod deque;
 pub mod dlist;
+pub mod enum_set;
 pub mod list;
 pub mod lru_cache;
 pub mod priority_queue;
diff --git a/src/libextra/lib.rs b/src/libextra/lib.rs
index dc5624f9de9..d05fc00f06e 100644
--- a/src/libextra/lib.rs
+++ b/src/libextra/lib.rs
@@ -45,7 +45,6 @@ pub mod json;
 pub mod tempfile;
 pub mod time;
 pub mod workcache;
-pub mod enum_set;
 pub mod stats;
 
 #[cfg(unicode)]
diff --git a/src/librustc/middle/ty.rs b/src/librustc/middle/ty.rs
index c19fe3445d9..f3016ff68a8 100644
--- a/src/librustc/middle/ty.rs
+++ b/src/librustc/middle/ty.rs
@@ -52,7 +52,7 @@ use syntax::opt_vec::OptVec;
 use syntax::opt_vec;
 use syntax::abi::AbiSet;
 use syntax;
-use extra::enum_set::{EnumSet, CLike};
+use collections::enum_set::{EnumSet, CLike};
 
 pub type Disr = u64;