diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-01-30 12:03:16 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-01-30 12:03:16 -0800 |
| commit | 692a3661fb731f70b1c72e527635c10219ed00e3 (patch) | |
| tree | b5301fc617c6d5b8df9f35d6f0eda0b9a12a3cce /src/libstd | |
| parent | 103f1459c00e66c7326f8d332f04f5b546c033c6 (diff) | |
| parent | 947f6ca4a1b8a3decc535963addb67864b988277 (diff) | |
rollup merge of #21704: FlaPer87/macro-reexport
Conflicts: src/libstd/lib.rs
Diffstat (limited to 'src/libstd')
| -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 54e2eaf16ee..3735a0035bd 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -114,7 +114,6 @@ #![feature(old_impl_check)] #![feature(optin_builtin_traits)] #![feature(int_uint)] -#![feature(int_uint)] #![feature(core)] #![feature(libc)] #![feature(alloc)] @@ -125,6 +124,7 @@ #![cfg_attr(test, feature(test))] // NOTE(stage0): remove cfg_attr after a snapshot #![cfg_attr(not(stage0), allow(unused_mut))] +#![feature(macro_reexport)] // Don't link to std. We are std. #![no_std] |