diff options
| author | Erik Desjardins <erikdesjardins@users.noreply.github.com> | 2022-04-17 02:15:45 -0400 |
|---|---|---|
| committer | Erik Desjardins <erikdesjardins@users.noreply.github.com> | 2022-04-17 02:15:45 -0400 |
| commit | b0d9c42c46ce0502fed45e5d7d0ba18a71030662 (patch) | |
| tree | 073ed6a6bb64d9740cbec220048ca5be9f05e556 /library/std/src | |
| parent | 43a71dc732af0f7cc5895cca8d001184c252426a (diff) | |
| download | rust-b0d9c42c46ce0502fed45e5d7d0ba18a71030662.tar.gz rust-b0d9c42c46ce0502fed45e5d7d0ba18a71030662.zip | |
Revert "Auto merge of #94373 - erikdesjardins:getitinl, r=Mark-Simulacrum"
This reverts commit 035a717ee8bf548868fb50b5c7ca562fc4a657a7, reversing changes made to 761e8884858759b21f3374ad610494e68c087a38.
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/thread/local.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/library/std/src/thread/local.rs b/library/std/src/thread/local.rs index 047d07ad57d..4ab8fb2e905 100644 --- a/library/std/src/thread/local.rs +++ b/library/std/src/thread/local.rs @@ -178,7 +178,7 @@ macro_rules! thread_local { macro_rules! __thread_local_inner { // used to generate the `LocalKey` value for const-initialized thread locals (@key $t:ty, const $init:expr) => {{ - #[cfg_attr(not(windows), inline(always))] // see comments below + #[cfg_attr(not(windows), inline)] // see comments below #[deny(unsafe_op_in_unsafe_fn)] unsafe fn __getit( _init: $crate::option::Option<&mut $crate::option::Option<$t>>, @@ -312,7 +312,7 @@ macro_rules! __thread_local_inner { // gets the pessimistic path for now where it's never inlined. // // The issue of "should enable on Windows sometimes" is #84933 - #[cfg_attr(not(windows), inline(always))] + #[cfg_attr(not(windows), inline)] unsafe fn __getit( init: $crate::option::Option<&mut $crate::option::Option<$t>>, ) -> $crate::option::Option<&'static $t> { |