Hoist non-platform-specific code out of thread_local_inner!

Author: Jules-Bertholet

library/std/src/sys/thread_local/native/mod.rs

@@ -108,10 +108,6 @@ pub macro thread_local_inner {
             })
         }
     }},
-    ($(#[$attr:meta])* $vis:vis $name:ident, $t:ty, $(#[$align_attr:meta])*, $($init:tt)*) => {
-        $(#[$attr])* $vis const $name: $crate::thread::LocalKey<$t> =
-            $crate::thread::local_impl::thread_local_inner!(@key $t, $(#[$align_attr])*, $($init)*);
-    },
 }
 
 #[rustc_macro_transparency = "semitransparent"]

library/std/src/sys/thread_local/no_threads.rs

@@ -39,11 +39,6 @@ pub macro thread_local_inner {
             })
         }
     }},
-
-    ($(#[$attr:meta])* $vis:vis $name:ident, $t:ty, $(#[$align_attr:meta])*, $($init:tt)*) => {
-        $(#[$attr])* $vis const $name: $crate::thread::LocalKey<$t> =
-            $crate::thread::local_impl::thread_local_inner!(@key $t, $(#[$align_attr])*, $($init)*);
-    },
 }
 
 #[allow(missing_debug_implementations)]

library/std/src/sys/thread_local/os.rs

@@ -85,11 +85,6 @@ pub macro thread_local_inner {
 
         $($crate::thread::local_impl::thread_local_inner!(@align $final_align, $($attr_rest)+);)?
     },
-
-    ($(#[$attr:meta])* $vis:vis $name:ident, $t:ty, $(#[$($align_attr:tt)*])*, $($init:tt)*) => {
-        $(#[$attr])* $vis const $name: $crate::thread::LocalKey<$t> =
-            $crate::thread::local_impl::thread_local_inner!(@key $t, $(#[$($align_attr)*])*, $($init)*);
-    },
 }
 
 /// Use a regular global static to store this key; the state provided will then be

library/std/src/thread/local.rs

@@ -327,13 +327,17 @@ pub macro thread_local_process_attrs {
 
     // process `const` declaration and recurse
     ([$($align_attrs:tt)*] [$($other_attrs:tt)*]; $vis:vis static $name:ident: $t:ty = const $init:block $(; $($($rest:tt)+)?)?) => (
-        $crate::thread::local_impl::thread_local_inner!($($other_attrs)* $vis $name, $t, $($align_attrs)*, const $init);
+        $($other_attrs)* $vis const $name: $crate::thread::LocalKey<$t> =
+            $crate::thread::local_impl::thread_local_inner!(@key $t, $($align_attrs)*, const $init);
+
         $($($crate::thread::local_impl::thread_local_process_attrs!([] []; $($rest)+);)?)?
     ),
 
     // process non-`const` declaration and recurse
     ([$($align_attrs:tt)*] [$($other_attrs:tt)*]; $vis:vis static $name:ident: $t:ty = $init:expr $(; $($($rest:tt)+)?)?) => (
-        $crate::thread::local_impl::thread_local_inner!($($other_attrs)* $vis $name, $t, $($align_attrs)*, $init);
+        $($other_attrs)* $vis const $name: $crate::thread::LocalKey<$t> =
+            $crate::thread::local_impl::thread_local_inner!(@key $t, $($align_attrs)*, $init);
+
         $($($crate::thread::local_impl::thread_local_process_attrs!([] []; $($rest)+);)?)?
     ),
 }