diff options
| author | Yuki Okushi <huyuumi.dev@gmail.com> | 2019-11-07 09:20:45 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-07 09:20:45 +0900 |
| commit | de401900b4d25b4a01c5f3e34554f9a656f89f84 (patch) | |
| tree | 18b5e3a3d76167e882c535ce44774695f717aece /src/libstd/thread | |
| parent | a2b4ad439cd11c3b9bfcc9b92c6feff6f7b0e042 (diff) | |
| parent | 936349c81b59581c7c3a834a6b61eb94168e2807 (diff) | |
| download | rust-de401900b4d25b4a01c5f3e34554f9a656f89f84.tar.gz rust-de401900b4d25b4a01c5f3e34554f9a656f89f84.zip | |
Rollup merge of #66146 - 3442853561:patch-2, r=Mark-Simulacrum
Remove unused parameters in `__thread_local_inner` Fixes #65993.
Diffstat (limited to 'src/libstd/thread')
| -rw-r--r-- | src/libstd/thread/local.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/thread/local.rs b/src/libstd/thread/local.rs index cfaab4e22e9..46453b47fca 100644 --- a/src/libstd/thread/local.rs +++ b/src/libstd/thread/local.rs @@ -149,7 +149,7 @@ macro_rules! 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) => { + (@key $t:ty, $init:expr) => { { #[inline] fn __init() -> $t { $init } @@ -184,7 +184,7 @@ macro_rules! __thread_local_inner { }; ($(#[$attr:meta])* $vis:vis $name:ident, $t:ty, $init:expr) => { $(#[$attr])* $vis const $name: $crate::thread::LocalKey<$t> = - $crate::__thread_local_inner!(@key $(#[$attr])* $vis $name, $t, $init); + $crate::__thread_local_inner!(@key $t, $init); } } |