diff options
| author | bors <bors@rust-lang.org> | 2019-03-03 05:51:44 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-03-03 05:51:44 +0000 |
| commit | ba43811a07f13975640e58e6acb3ba3d1399cf78 (patch) | |
| tree | 5b9c9a7e8b2f837d7d687ee87ff6b4dbbc635986 /src/libstd/thread | |
| parent | 7dbba3d03c5d3e9fdb96556eac1be49449c41edc (diff) | |
| parent | 04679431a249570bb2ca6d5813ebb37db76cc9db (diff) | |
| download | rust-ba43811a07f13975640e58e6acb3ba3d1399cf78.tar.gz rust-ba43811a07f13975640e58e6acb3ba3d1399cf78.zip | |
Auto merge of #58793 - Mark-Simulacrum:master-next, r=alexcrichton
Bootstrap compiler update for 1.35 release r? @alexcrichton
Diffstat (limited to 'src/libstd/thread')
| -rw-r--r-- | src/libstd/thread/local.rs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/libstd/thread/local.rs b/src/libstd/thread/local.rs index d1f53734d30..3a876e05ecc 100644 --- a/src/libstd/thread/local.rs +++ b/src/libstd/thread/local.rs @@ -126,8 +126,7 @@ impl<T: 'static> fmt::Debug for LocalKey<T> { /// [`std::thread::LocalKey`]: ../std/thread/struct.LocalKey.html #[macro_export] #[stable(feature = "rust1", since = "1.0.0")] -#[cfg_attr(stage0, allow_internal_unstable)] -#[cfg_attr(not(stage0), allow_internal_unstable(thread_local_internals))] +#[allow_internal_unstable(thread_local_internals)] macro_rules! thread_local { // empty (base case for the recursion) () => {}; @@ -149,10 +148,7 @@ macro_rules! thread_local { reason = "should not be necessary", issue = "0")] #[macro_export] -#[cfg_attr(stage0, allow_internal_unstable)] -#[cfg_attr(not(stage0), allow_internal_unstable( - thread_local_internals, cfg_target_thread_local, thread_local, -))] +#[allow_internal_unstable(thread_local_internals, cfg_target_thread_local, thread_local)] #[allow_internal_unsafe] macro_rules! __thread_local_inner { (@key $(#[$attr:meta])* $vis:vis $name:ident, $t:ty, $init:expr) => { |