diff options
| -rw-r--r-- | src/libcollections/lib.rs | 1 | ||||
| -rw-r--r-- | src/libstd/bitflags.rs (renamed from src/libcollections/bitflags.rs) | 8 | ||||
| -rw-r--r-- | src/libstd/lib.rs | 3 |
3 files changed, 5 insertions, 7 deletions
diff --git a/src/libcollections/lib.rs b/src/libcollections/lib.rs index 891ac3be0e9..2121e129c35 100644 --- a/src/libcollections/lib.rs +++ b/src/libcollections/lib.rs @@ -42,7 +42,6 @@ pub use smallintmap::SmallIntMap; pub use treemap::{TreeMap, TreeSet}; pub use trie::{TrieMap, TrieSet}; -pub mod bitflags; pub mod bitv; pub mod btree; pub mod deque; diff --git a/src/libcollections/bitflags.rs b/src/libstd/bitflags.rs index 3e50f415392..3caa5b5ab3c 100644 --- a/src/libcollections/bitflags.rs +++ b/src/libstd/bitflags.rs @@ -17,9 +17,6 @@ //! # Example //! //! ~~~rust -//! #[feature(phase)]; -//! #[phase(syntax)] extern crate collections; -//! //! bitflags!(Flags: u32 { //! FlagA = 0x00000001, //! FlagB = 0x00000010, @@ -41,9 +38,6 @@ //! The generated `struct`s can also be extended with type and trait implementations: //! //! ~~~rust -//! #[feature(phase)]; -//! #[phase(syntax)] extern crate collections; -//! //! use std::fmt; //! //! bitflags!(Flags: u32 { @@ -174,6 +168,8 @@ macro_rules! bitflags( #[cfg(test)] mod tests { + use ops::{BitOr, BitAnd, Sub}; + bitflags!(Flags: u32 { FlagA = 0x00000001, FlagB = 0x00000010, diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 841a73fa01f..c34ebfdf7c2 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -142,7 +142,10 @@ fn start(argc: int, argv: **u8) -> int { green::start(argc, argv, rustuv::event_loop, __test::main) } +/* Exported macros */ + pub mod macros; +pub mod bitflags; mod rtdeps; |