diff options
| author | bors <bors@rust-lang.org> | 2015-01-17 20:31:08 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-01-17 20:31:08 +0000 |
| commit | f4f10dba2975b51c2d2c92157018db3ac13d4d4a (patch) | |
| tree | 54bad6d9f9d3472c424b02ec91ff508a81ea1ffa /src/libsyntax | |
| parent | 89c4e3792ddc5b45706ea0e919806a248f7a87c3 (diff) | |
| parent | 6553c0f5eb7cb903b698431556ade4e954dcb4e6 (diff) | |
auto merge of #21300 : steveklabnik/rust/rollup, r=steveklabnik
manual rollup to fix some conflicts and diagnose why the test is failing...
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/lib.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs index 9c947f422e9..096e96b003b 100644 --- a/src/libsyntax/lib.rs +++ b/src/libsyntax/lib.rs @@ -35,6 +35,7 @@ extern crate serialize; extern crate term; extern crate libc; #[macro_use] extern crate log; +#[macro_use] #[no_link] extern crate rustc_bitflags; extern crate "serialize" as rustc_serialize; // used by deriving |