bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

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

Browse source 
Part of #8784

Also removed the one glob import.
This commit is contained in:
bors 2014-02-21 05:26:58 -08:00
commit 2fa7d6b44f
4 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libextra/enum_set.rs → src/libcollections/enum_set.rs
View file

@ -139,7 +139,7 @@ mod test {
use std::cast; use std::cast;
use enum_set::*; use enum_set::{EnumSet, CLike};
#[deriving(Eq)] #[deriving(Eq)]
#[repr(uint)] #[repr(uint)]

2
src/libcollections/lib.rs
View file

@ -26,6 +26,7 @@ pub use bitv::Bitv;
pub use btree::BTree; pub use btree::BTree;
pub use deque::Deque; pub use deque::Deque;
pub use dlist::DList; pub use dlist::DList;
pub use enum_set::EnumSet;
pub use list::List; pub use list::List;
pub use lru_cache::LruCache; pub use lru_cache::LruCache;
pub use priority_queue::PriorityQueue; pub use priority_queue::PriorityQueue;
@ -37,6 +38,7 @@ pub mod bitv;
pub mod btree; pub mod btree;
pub mod deque; pub mod deque;
pub mod dlist; pub mod dlist;
pub mod enum_set;
pub mod list; pub mod list;
pub mod lru_cache; pub mod lru_cache;
pub mod priority_queue; pub mod priority_queue;

1
src/libextra/lib.rs
View file

@ -45,7 +45,6 @@ pub mod json;
pub mod tempfile; pub mod tempfile;
pub mod time; pub mod time;
pub mod workcache; pub mod workcache;
pub mod enum_set;
pub mod stats; pub mod stats;
#[cfg(unicode)] #[cfg(unicode)]

2
src/librustc/middle/ty.rs
View file

@ -52,7 +52,7 @@ use syntax::opt_vec::OptVec;
use syntax::opt_vec; use syntax::opt_vec;
use syntax::abi::AbiSet; use syntax::abi::AbiSet;
use syntax; use syntax;
use extra::enum_set::{EnumSet, CLike}; use collections::enum_set::{EnumSet, CLike};
pub type Disr = u64; pub type Disr = u64;