diff options
| author | bors <bors@rust-lang.org> | 2014-09-04 20:21:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-09-04 20:21:02 +0000 |
| commit | e024017f60c93b6ff4f37bd4bd580f30deafb107 (patch) | |
| tree | 7df072df6ef8016b7644340a12138dd5567a7607 /src/libstd/lib.rs | |
| parent | d3e7922ddd5f2abfa4d5139e8bca5fab3e796f33 (diff) | |
| parent | ef354d850e516e7005da050f0b5b8d3a5c2d7f45 (diff) | |
| download | rust-e024017f60c93b6ff4f37bd4bd580f30deafb107.tar.gz rust-e024017f60c93b6ff4f37bd4bd580f30deafb107.zip | |
auto merge of #16986 : bjz/rust/bitflags, r=alexcrichton
Closes #16469
Diffstat (limited to 'src/libstd/lib.rs')
| -rw-r--r-- | src/libstd/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index b29e5b7c148..08255ba0cb2 100644 --- 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![] |