auto merge of #16986 : bjz/rust/bitflags, r=alexcrichton

Closes #16469
2014-09-04 20:21:02 +00:00
parent d3e7922ddd ef354d850e
commit e024017f60
3 changed files with 136 additions and 117 deletions
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -281,7 +281,7 @@ mod std {
    pub use fmt; // used for any formatting strings
    pub use io; // used for println!()
    pub use local_data; // used for local_data_key!()
-    pub use option; // used for bitflags!()
+    pub use option; // used for bitflags!{}
    pub use rt; // used for fail!()
    pub use vec; // used for vec![]