diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-01-06 09:24:46 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-01-06 15:24:24 -0800 |
| commit | e2f97f51ad4cf902e5a5835b5332447fe59089c4 (patch) | |
| tree | 6158174fbd2ae40d72c113d398ff192a936804f7 /src/libstd/thread_local | |
| parent | 5c3ddcb15dc8b40fa780a38fd7494b9b5b991d09 (diff) | |
| download | rust-e2f97f51ad4cf902e5a5835b5332447fe59089c4.tar.gz rust-e2f97f51ad4cf902e5a5835b5332447fe59089c4.zip | |
Register new snapshots
Conflicts: src/librbml/lib.rs src/libserialize/json_stage0.rs src/libserialize/serialize_stage0.rs src/libsyntax/ast.rs src/libsyntax/ext/deriving/generic/mod.rs src/libsyntax/parse/token.rs
Diffstat (limited to 'src/libstd/thread_local')
| -rw-r--r-- | src/libstd/thread_local/mod.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libstd/thread_local/mod.rs b/src/libstd/thread_local/mod.rs index e0cbaa8ca50..c11162c09bc 100644 --- a/src/libstd/thread_local/mod.rs +++ b/src/libstd/thread_local/mod.rs @@ -40,8 +40,7 @@ use prelude::v1::*; use cell::UnsafeCell; -#[cfg_attr(stage0, macro_escape)] -#[cfg_attr(not(stage0), macro_use)] +#[macro_use] pub mod scoped; // Sure wish we had macro hygiene, no? |