diff options
| author | bors <bors@rust-lang.org> | 2017-09-01 16:39:31 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-09-01 16:39:31 +0000 |
| commit | f861b6ee46465097eec266c160ac53e230df7cf0 (patch) | |
| tree | 405f0e674dbf26844264142051397b7fcee53d5f /src/libstd/thread | |
| parent | ed532c0d933aaae45e6804efc5936bea078bbaad (diff) | |
| parent | 271c63c18925725a9451c3e769e327f5c5a1167c (diff) | |
| download | rust-f861b6ee46465097eec266c160ac53e230df7cf0.tar.gz rust-f861b6ee46465097eec266c160ac53e230df7cf0.zip | |
Auto merge of #44154 - alexcrichton:bump-bootstrap, r=Mark-Simulacrum
Bump to 1.22.0 and update boostrap compiler Time to get a new nightly!
Diffstat (limited to 'src/libstd/thread')
| -rw-r--r-- | src/libstd/thread/local.rs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/libstd/thread/local.rs b/src/libstd/thread/local.rs index 7a9b642350f..02347bf4906 100644 --- a/src/libstd/thread/local.rs +++ b/src/libstd/thread/local.rs @@ -157,7 +157,7 @@ macro_rules! thread_local { issue = "0")] #[macro_export] #[allow_internal_unstable] -#[cfg_attr(not(stage0), allow_internal_unsafe)] +#[allow_internal_unsafe] macro_rules! __thread_local_inner { ($(#[$attr:meta])* $vis:vis $name:ident, $t:ty, $init:expr) => { $(#[$attr])* $vis static $name: $crate::thread::LocalKey<$t> = { @@ -394,9 +394,6 @@ pub mod fast { } } - #[cfg(stage0)] - unsafe impl<T> ::marker::Sync for Key<T> { } - impl<T> Key<T> { pub const fn new() -> Key<T> { Key { |