rollup merge of #23579: Ms2ger/thread_local-unsafe

Conflicts:
	src/libstd/thread/local.rs

1 files changed, 3 insertions, 5 deletions

diff --git a/src/libstd/thread/local.rs b/src/libstd/thread/local.rs
index 43142d2e5bc..023c6b26cbc 100644
--- a/src/libstd/thread/local.rs
+++ b/src/libstd/thread/local.rs
@@ -178,15 +178,13 @@ macro_rules! __thread_local_inner {
 
         #[cfg(any(not(any(target_os = "macos", target_os = "linux")), target_arch = "aarch64"))]
         const _INIT: ::std::thread::__local::__impl::KeyInner<$t> = {
-            unsafe extern fn __destroy(ptr: *mut u8) {
-                ::std::thread::__local::__impl::destroy_value::<$t>(ptr);
-            }
-
             ::std::thread::__local::__impl::KeyInner {
                 inner: ::std::cell::UnsafeCell { value: $init },
                 os: ::std::thread::__local::__impl::OsStaticKey {
                     inner: ::std::thread::__local::__impl::OS_INIT_INNER,
-                    dtor: ::std::option::Option::Some(__destroy as unsafe extern fn(*mut u8)),
+                    dtor: ::std::option::Option::Some(
+                        ::std::thread::__local::__impl::destroy_value::<$t>
+                    ),
                 },
             }
         };