Skip to content

Commit 70d05b7

Browse files
committed
Avoid use imports in thread_local_inner! in statik
Fixes #131863 for wasm targets All other macros were done in #131866, but this sub module is missed.
1 parent 55b7f8e commit 70d05b7

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ pub macro thread_local_inner {
1414
(@key $t:ty, const $init:expr) => {{
1515
const __INIT: $t = $init;
1616

17+
// NOTE: this cannot import `LocalKey` or `Storage` with a `use` because that can shadow
18+
// user provided type or type alias with a matching name. Please update the shadowing test
19+
// in `tests/thread.rs` if these types are renamed.
1720
unsafe {
18-
use $crate::thread::LocalKey;
19-
use $crate::thread::local_impl::EagerStorage;
20-
21-
LocalKey::new(|_| {
22-
static VAL: EagerStorage<$t> = EagerStorage { value: __INIT };
21+
$crate::thread::LocalKey::new(|_| {
22+
static VAL: $crate::thread::local_impl::EagerStorage<$t> = $crate::thread::local_impl::EagerStorage { value: __INIT };
2323
&VAL.value
2424
})
2525
}

0 commit comments

Comments
 (0)