diff options
| author | bors <bors@rust-lang.org> | 2019-02-12 12:10:10 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-02-12 12:10:10 +0000 |
| commit | c84e7976423bb910bb5eb5eecffc7e33a897a97f (patch) | |
| tree | 24570884cb7742fe817286a3cde2643722eb8c6a /src/libstd/thread | |
| parent | a54b5c7a645ead203d77e78245362f9e0f00dd3c (diff) | |
| parent | bbe524d7c1a1028737a93c7c71c508a68363b681 (diff) | |
| download | rust-c84e7976423bb910bb5eb5eecffc7e33a897a97f.tar.gz rust-c84e7976423bb910bb5eb5eecffc7e33a897a97f.zip | |
Auto merge of #58098 - oli-obk:maybe_allow_internal_unstable, r=petrochenkov
Require a list of features in `#[allow_internal_unstable]` The blanket-permission slip is not great and will likely give us trouble some point down the road.
Diffstat (limited to 'src/libstd/thread')
| -rw-r--r-- | src/libstd/thread/local.rs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/libstd/thread/local.rs b/src/libstd/thread/local.rs index 5d2eb5f8e73..8207709e1f9 100644 --- a/src/libstd/thread/local.rs +++ b/src/libstd/thread/local.rs @@ -126,7 +126,8 @@ 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")] -#[allow_internal_unstable] +#[cfg_attr(stage0, allow_internal_unstable)] +#[cfg_attr(not(stage0), allow_internal_unstable(thread_local_internals))] macro_rules! thread_local { // empty (base case for the recursion) () => {}; @@ -148,7 +149,10 @@ macro_rules! thread_local { reason = "should not be necessary", issue = "0")] #[macro_export] -#[allow_internal_unstable] +#[cfg_attr(stage0, allow_internal_unstable)] +#[cfg_attr(not(stage0), 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) => { |