Skip to content

Commit 5bf8d32

Browse files
committed
move enum_set to libcollections. #8784
1 parent 879e8aa commit 5bf8d32

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

src/libextra/enum_set.rs renamed to src/libcollections/enum_set.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ mod test {
139139

140140
use std::cast;
141141

142-
use enum_set::*;
142+
use enum_set::{EnumSet, CLike};
143143

144144
#[deriving(Eq)]
145145
#[repr(uint)]

src/libcollections/lib.rs

+2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ pub use bitv::Bitv;
2626
pub use btree::BTree;
2727
pub use deque::Deque;
2828
pub use dlist::DList;
29+
pub use enum_set::EnumSet;
2930
pub use list::List;
3031
pub use lru_cache::LruCache;
3132
pub use priority_queue::PriorityQueue;
@@ -37,6 +38,7 @@ pub mod bitv;
3738
pub mod btree;
3839
pub mod deque;
3940
pub mod dlist;
41+
pub mod enum_set;
4042
pub mod list;
4143
pub mod lru_cache;
4244
pub mod priority_queue;

src/libextra/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ pub mod json;
5050
pub mod tempfile;
5151
pub mod time;
5252
pub mod workcache;
53-
pub mod enum_set;
5453
pub mod stats;
5554

5655
#[cfg(unicode)]

src/librustc/middle/ty.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ use syntax::opt_vec::OptVec;
5050
use syntax::opt_vec;
5151
use syntax::abi::AbiSet;
5252
use syntax;
53-
use extra::enum_set::{EnumSet, CLike};
53+
use collections::enum_set::{EnumSet, CLike};
5454

5555
pub type Disr = u64;
5656

0 commit comments

Comments
 (0)