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

pietroalbini · web-flow · commit f573bd88917f · 2019-11-06T16:28:52.000+01:00
Remove unused parameters in `__thread_local_inner` Fixes rust-lang#65993.
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);
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ macro_rules! thread_local {`
`149`	`149`	`#[allow_internal_unstable(thread_local_internals, cfg_target_thread_local, thread_local)]`
`150`	`150`	`#[allow_internal_unsafe]`
`151`	`151`	`macro_rules! __thread_local_inner {`
`152`		`- (@key $(#[$attr:meta])* $vis:vis $name:ident, $t:ty, $init:expr) => {`
	`152`	`+ (@key $t:ty, $init:expr) => {`
`153`	`153`	`{`
`154`	`154`	`#[inline]`
`155`	`155`	`fn __init() -> $t { $init }`
`@@ -184,7 +184,7 @@ macro_rules! __thread_local_inner {`
`184`	`184`	`};`
`185`	`185`	`($(#[$attr:meta])* $vis:vis $name:ident, $t:ty, $init:expr) => {`
`186`	`186`	`$(#[$attr])* $vis const $name: $crate::thread::LocalKey<$t> =`
`187`		`- $crate::__thread_local_inner!(@key $(#[$attr])* $vis $name, $t, $init);`
	`187`	`+ $crate::__thread_local_inner!(@key $t, $init);`
`188`	`188`	`}`
`189`	`189`	`}`
`190`	`190`