Rollup merge of rust-lang#66146 - 3442853561:patch-2, r=Mark-Simulacrum

Remove unused parameters in `__thread_local_inner` Fixes rust-lang#65993.
pietroalbini · Nov 6, 2019 · f573bd8 · f573bd8
2 parents e3fbd3c + 936349c
commit f573bd8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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);
     }
 }