Skip to content

Commit b62576f

Browse files
committed
Rename thread_local_initializer_can_be_made_const to missing_const_for_thread_local
1 parent 6ad5455 commit b62576f

12 files changed

+92
-85
lines changed

CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5589,7 +5589,7 @@ Released 2018-09-13
55895589
[`missing_assert_message`]: https://rust-lang.github.io/rust-clippy/master/index.html#missing_assert_message
55905590
[`missing_asserts_for_indexing`]: https://rust-lang.github.io/rust-clippy/master/index.html#missing_asserts_for_indexing
55915591
[`missing_const_for_fn`]: https://rust-lang.github.io/rust-clippy/master/index.html#missing_const_for_fn
5592-
[`missing_const_for_tl_init`]: https://rust-lang.github.io/rust-clippy/master/index.html#missing_const_for_tl_init
5592+
[`missing_const_for_thread_local`]: https://rust-lang.github.io/rust-clippy/master/index.html#missing_const_for_thread_local
55935593
[`missing_docs_in_private_items`]: https://rust-lang.github.io/rust-clippy/master/index.html#missing_docs_in_private_items
55945594
[`missing_enforced_import_renames`]: https://rust-lang.github.io/rust-clippy/master/index.html#missing_enforced_import_renames
55955595
[`missing_errors_doc`]: https://rust-lang.github.io/rust-clippy/master/index.html#missing_errors_doc

clippy_config/src/msrvs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ msrv_aliases! {
2626
1,65,0 { LET_ELSE, POINTER_CAST_CONSTNESS }
2727
1,63,0 { CLONE_INTO }
2828
1,62,0 { BOOL_THEN_SOME, DEFAULT_ENUM_ATTRIBUTE, CONST_EXTERN_FN }
29-
1,59,0 { THREAD_LOCAL_INITIALIZER_CAN_BE_MADE_CONST }
29+
1,59,0 { MISSING_CONST_FOR_THREAD_LOCAL }
3030
1,58,0 { FORMAT_ARGS_CAPTURE, PATTERN_TRAIT_CHAR_ARRAY, CONST_RAW_PTR_DEREF }
3131
1,56,0 { CONST_FN_UNION }
3232
1,55,0 { SEEK_REWIND }

clippy_lints/src/declared_lints.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ pub(crate) static LINTS: &[&crate::LintInfo] = &[
505505
crate::missing_assert_message::MISSING_ASSERT_MESSAGE_INFO,
506506
crate::missing_asserts_for_indexing::MISSING_ASSERTS_FOR_INDEXING_INFO,
507507
crate::missing_const_for_fn::MISSING_CONST_FOR_FN_INFO,
508-
crate::missing_const_for_tl_init::MISSING_CONST_FOR_TL_INIT_INFO,
508+
crate::missing_const_for_thread_local::MISSING_CONST_FOR_THREAD_LOCAL_INFO,
509509
crate::missing_doc::MISSING_DOCS_IN_PRIVATE_ITEMS_INFO,
510510
crate::missing_enforced_import_rename::MISSING_ENFORCED_IMPORT_RENAMES_INFO,
511511
crate::missing_fields_in_debug::MISSING_FIELDS_IN_DEBUG_INFO,

clippy_lints/src/lib.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ mod mismatching_type_param_order;
230230
mod missing_assert_message;
231231
mod missing_asserts_for_indexing;
232232
mod missing_const_for_fn;
233-
mod missing_const_for_tl_init;
233+
mod missing_const_for_thread_local;
234234
mod missing_doc;
235235
mod missing_enforced_import_rename;
236236
mod missing_fields_in_debug;
@@ -1156,9 +1156,8 @@ pub fn register_lints(store: &mut rustc_lint::LintStore, conf: &'static Conf) {
11561156
behavior: pub_underscore_fields_behavior,
11571157
})
11581158
});
1159-
store.register_late_pass(move |_| {
1160-
Box::new(missing_const_for_tl_init::ThreadLocalInitializerCanBeMadeConst::new(msrv()))
1161-
});
1159+
store
1160+
.register_late_pass(move |_| Box::new(missing_const_for_thread_local::MissingConstForThreadLocal::new(msrv())));
11621161
store.register_late_pass(move |_| Box::new(incompatible_msrv::IncompatibleMsrv::new(msrv())));
11631162
store.register_late_pass(|_| Box::new(to_string_trait_impl::ToStringTraitImpl));
11641163
store.register_early_pass(|| Box::new(multiple_bound_locations::MultipleBoundLocations));

clippy_lints/src/missing_const_for_tl_init.rs renamed to clippy_lints/src/missing_const_for_thread_local.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -39,23 +39,23 @@ declare_clippy_lint! {
3939
/// }
4040
/// ```
4141
#[clippy::version = "1.77.0"]
42-
pub MISSING_CONST_FOR_TL_INIT,
42+
pub MISSING_CONST_FOR_THREAD_LOCAL,
4343
perf,
4444
"suggest using `const` in `thread_local!` macro"
4545
}
4646

47-
pub struct ThreadLocalInitializerCanBeMadeConst {
47+
pub struct MissingConstForThreadLocal {
4848
msrv: Msrv,
4949
}
5050

51-
impl ThreadLocalInitializerCanBeMadeConst {
51+
impl MissingConstForThreadLocal {
5252
#[must_use]
5353
pub fn new(msrv: Msrv) -> Self {
5454
Self { msrv }
5555
}
5656
}
5757

58-
impl_lint_pass!(ThreadLocalInitializerCanBeMadeConst => [MISSING_CONST_FOR_TL_INIT]);
58+
impl_lint_pass!(MissingConstForThreadLocal => [MISSING_CONST_FOR_THREAD_LOCAL]);
5959

6060
#[inline]
6161
fn is_thread_local_initializer(
@@ -102,7 +102,7 @@ fn initializer_can_be_made_const(cx: &LateContext<'_>, defid: rustc_span::def_id
102102
false
103103
}
104104

105-
impl<'tcx> LateLintPass<'tcx> for ThreadLocalInitializerCanBeMadeConst {
105+
impl<'tcx> LateLintPass<'tcx> for MissingConstForThreadLocal {
106106
fn check_fn(
107107
&mut self,
108108
cx: &LateContext<'tcx>,
@@ -113,7 +113,7 @@ impl<'tcx> LateLintPass<'tcx> for ThreadLocalInitializerCanBeMadeConst {
113113
local_defid: rustc_span::def_id::LocalDefId,
114114
) {
115115
let defid = local_defid.to_def_id();
116-
if self.msrv.meets(msrvs::MISSING_CONST_FOR_TL_INIT)
116+
if self.msrv.meets(msrvs::MISSING_CONST_FOR_THREAD_LOCAL)
117117
&& is_thread_local_initializer(cx, fn_kind, span).unwrap_or(false)
118118
// Some implementations of `thread_local!` include an initializer fn.
119119
// In the case of a const initializer, the init fn is also const,
@@ -139,7 +139,7 @@ impl<'tcx> LateLintPass<'tcx> for ThreadLocalInitializerCanBeMadeConst {
139139
{
140140
span_lint_and_sugg(
141141
cx,
142-
MISSING_CONST_FOR_TL_INIT,
142+
MISSING_CONST_FOR_THREAD_LOCAL,
143143
unpeeled.span,
144144
"initializer for `thread_local` value can be made `const`",
145145
"replace with",

clippy_lints/src/renamed_lints.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ pub static RENAMED_LINTS: &[(&str, &str)] = &[
3232
("clippy::result_unwrap_used", "clippy::unwrap_used"),
3333
("clippy::single_char_push_str", "clippy::single_char_add_str"),
3434
("clippy::stutter", "clippy::module_name_repetitions"),
35-
("clippy::thread_local_initializer_can_be_made_const", "clippy::missing_const_for_tl_init"),
35+
("clippy::thread_local_initializer_can_be_made_const", "clippy::missing_const_for_thread_local"),
3636
("clippy::to_string_in_display", "clippy::recursive_format_impl"),
3737
("clippy::unwrap_or_else_default", "clippy::unwrap_or_default"),
3838
("clippy::zero_width_space", "clippy::invisible_characters"),

tests/ui/missing_const_for_tl_init.fixed renamed to tests/ui/missing_const_for_thread_local.fixed

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![warn(clippy::missing_const_for_tl_init)]
1+
#![warn(clippy::missing_const_for_thread_local)]
22

33
use std::cell::{Cell, RefCell};
44

tests/ui/missing_const_for_tl_init.rs renamed to tests/ui/missing_const_for_thread_local.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![warn(clippy::missing_const_for_tl_init)]
1+
#![warn(clippy::missing_const_for_thread_local)]
22

33
use std::cell::{Cell, RefCell};
44

tests/ui/missing_const_for_tl_init.stderr renamed to tests/ui/missing_const_for_thread_local.stderr

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
error: initializer for `thread_local` value can be made `const`
2-
--> tests/ui/thread_local_initializer_can_be_made_const.rs:8:41
2+
--> tests/ui/missing_const_for_thread_local.rs:8:41
33
|
44
LL | static BUF_1: RefCell<String> = RefCell::new(String::new());
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: replace with: `const { RefCell::new(String::new()) }`
66
|
7-
= note: `-D clippy::thread-local-initializer-can-be-made-const` implied by `-D warnings`
8-
= help: to override `-D warnings` add `#[allow(clippy::thread_local_initializer_can_be_made_const)]`
7+
= note: `-D clippy::missing-const-for-thread-local` implied by `-D warnings`
8+
= help: to override `-D warnings` add `#[allow(clippy::missing_const_for_thread_local)]`
99

1010
error: initializer for `thread_local` value can be made `const`
11-
--> tests/ui/thread_local_initializer_can_be_made_const.rs:18:29
11+
--> tests/ui/missing_const_for_thread_local.rs:18:29
1212
|
1313
LL | static SIMPLE:i32 = 1;
1414
| ^ help: replace with: `const { 1 }`
1515

1616
error: initializer for `thread_local` value can be made `const`
17-
--> tests/ui/thread_local_initializer_can_be_made_const.rs:24:59
17+
--> tests/ui/missing_const_for_thread_local.rs:24:59
1818
|
1919
LL | static BUF_3_CAN_BE_MADE_CONST: RefCell<String> = RefCell::new(String::new());
2020
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: replace with: `const { RefCell::new(String::new()) }`
2121

2222
error: initializer for `thread_local` value can be made `const`
23-
--> tests/ui/thread_local_initializer_can_be_made_const.rs:26:59
23+
--> tests/ui/missing_const_for_thread_local.rs:26:59
2424
|
2525
LL | static BUF_4_CAN_BE_MADE_CONST: RefCell<String> = RefCell::new(String::new());
2626
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: replace with: `const { RefCell::new(String::new()) }`
2727

2828
error: initializer for `thread_local` value can be made `const`
29-
--> tests/ui/thread_local_initializer_can_be_made_const.rs:32:31
29+
--> tests/ui/missing_const_for_thread_local.rs:32:31
3030
|
3131
LL | static PEEL_ME: i32 = { 1 };
3232
| ^^^^^ help: replace with: `const { 1 }`
3333

3434
error: initializer for `thread_local` value can be made `const`
35-
--> tests/ui/thread_local_initializer_can_be_made_const.rs:34:36
35+
--> tests/ui/missing_const_for_thread_local.rs:34:36
3636
|
3737
LL | static PEEL_ME_MANY: i32 = { let x = 1; x * x };
3838
| ^^^^^^^^^^^^^^^^^^^^ help: replace with: `const { { let x = 1; x * x } }`

tests/ui/rename.fixed

+2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#![allow(clippy::needless_borrow)]
2828
#![allow(clippy::single_char_add_str)]
2929
#![allow(clippy::module_name_repetitions)]
30+
#![allow(clippy::missing_const_for_thread_local)]
3031
#![allow(clippy::recursive_format_impl)]
3132
#![allow(clippy::unwrap_or_default)]
3233
#![allow(clippy::invisible_characters)]
@@ -83,6 +84,7 @@
8384
#![warn(clippy::unwrap_used)]
8485
#![warn(clippy::single_char_add_str)]
8586
#![warn(clippy::module_name_repetitions)]
87+
#![warn(clippy::missing_const_for_thread_local)]
8688
#![warn(clippy::recursive_format_impl)]
8789
#![warn(clippy::unwrap_or_default)]
8890
#![warn(clippy::invisible_characters)]

tests/ui/rename.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#![allow(clippy::needless_borrow)]
2828
#![allow(clippy::single_char_add_str)]
2929
#![allow(clippy::module_name_repetitions)]
30-
#![allow(clippy::missing_const_for_tl_init)]
30+
#![allow(clippy::missing_const_for_thread_local)]
3131
#![allow(clippy::recursive_format_impl)]
3232
#![allow(clippy::unwrap_or_default)]
3333
#![allow(clippy::invisible_characters)]

0 commit comments

Comments
 (0)