move enum_set to libcollections. #8784

rust-lang · Feb 20, 2014 · 5bf8d32 · 5bf8d32 · bors · Feb 21, 2014
1 parent 879e8aa
commit 5bf8d32
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/src/libextra/enum_set.rs → src/libcollections/enum_set.rs b/src/libextra/enum_set.rs → 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
@@ -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
@@ -50,7 +50,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
@@ -50,7 +50,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;