squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

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

Browse source 
Remove unused parameters in `__thread_local_inner`

Fixes #65993.
This commit is contained in:
Yuki Okushi 2019-11-07 09:20:45 +09:00 committed by GitHub
commit de401900b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libstd/thread/local.rs
View file

@ -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);
}
}