diff options
| author | bors <bors@rust-lang.org> | 2017-10-27 18:00:32 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-10-27 18:00:32 +0000 |
| commit | d9f124965551e8fb9403def6a715e13dfd5e9c95 (patch) | |
| tree | e3b0abf4124b9daa7f63d3dbe1c6f800eba73e2a /src/libstd/thread | |
| parent | bed9a85c40f98ab8f4445b66d285d4108de9ad21 (diff) | |
| parent | 8ceacf4e1138d382da3c58ef5f8e0791c00fe100 (diff) | |
| download | rust-d9f124965551e8fb9403def6a715e13dfd5e9c95.tar.gz rust-d9f124965551e8fb9403def6a715e13dfd5e9c95.zip | |
Auto merge of #45285 - alexcrichton:update-bootstrap, r=Mark-Simulacrum
Bump to 1.23 and update bootstrap This commit updates the bootstrap compiler, bumps the version to 1.23, updates Cargo, updates books, and updates crates.io dependencies
Diffstat (limited to 'src/libstd/thread')
| -rw-r--r-- | src/libstd/thread/local.rs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/libstd/thread/local.rs b/src/libstd/thread/local.rs index cb18eed8ee5..fcbca38a98f 100644 --- a/src/libstd/thread/local.rs +++ b/src/libstd/thread/local.rs @@ -190,11 +190,6 @@ macro_rules! __thread_local_inner { } }; ($(#[$attr:meta])* $vis:vis $name:ident, $t:ty, $init:expr) => { - #[cfg(stage0)] - $(#[$attr])* $vis static $name: $crate::thread::LocalKey<$t> = - __thread_local_inner!(@key $(#[$attr])* $vis $name, $t, $init); - - #[cfg(not(stage0))] $(#[$attr])* $vis const $name: $crate::thread::LocalKey<$t> = __thread_local_inner!(@key $(#[$attr])* $vis $name, $t, $init); } |