From 5bf8d3289f155964bdcb9c0ef65d010ac0ff1388 Mon Sep 17 00:00:00 2001
From: HeroesGrave <heroesgrave@gmail.com>
Date: Thu, 20 Feb 2014 19:10:41 +1300
Subject: [PATCH] move enum_set to libcollections. #8784

---
 src/{libextra => libcollections}/enum_set.rs | 2 +-
 src/libcollections/lib.rs                    | 2 ++
 src/libextra/lib.rs                          | 1 -
 src/librustc/middle/ty.rs                    | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)
 rename src/{libextra => libcollections}/enum_set.rs (99%)

diff --git a/src/libextra/enum_set.rs b/src/libcollections/enum_set.rs
similarity index 99%
rename from src/libextra/enum_set.rs
rename to 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 e97eeac4f66..4eeabc38905 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 be7aa216e30..7dd9347ac1d 100644
--- 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
index 5bc3d047c9f..9baf17f7078 100644
--- 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;