Skip to content

Commit 697f3b6

Browse files
committed
Auto merge of #6775 - matthiaskrgr:upper_case_pedantic, r=flip1995
upper_case_acronyms: move lint from style to pedantic lint group The lint does point out inconsistency with the Rust naming convention, but the fact that rustc does not warn about the inconsistency by default means that clippy probably should not warn by default either. changelog: move upper_case_acronyms lint from style to pedantic group.
2 parents fe01ddc + 0eefa61 commit 697f3b6

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

clippy_lints/src/lib.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1402,6 +1402,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
14021402
LintId::of(&unnecessary_wraps::UNNECESSARY_WRAPS),
14031403
LintId::of(&unnested_or_patterns::UNNESTED_OR_PATTERNS),
14041404
LintId::of(&unused_self::UNUSED_SELF),
1405+
LintId::of(&upper_case_acronyms::UPPER_CASE_ACRONYMS),
14051406
LintId::of(&wildcard_imports::ENUM_GLOB_USE),
14061407
LintId::of(&wildcard_imports::WILDCARD_IMPORTS),
14071408
LintId::of(&zero_sized_map_values::ZERO_SIZED_MAP_VALUES),
@@ -1700,7 +1701,6 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
17001701
LintId::of(&unused_unit::UNUSED_UNIT),
17011702
LintId::of(&unwrap::PANICKING_UNWRAP),
17021703
LintId::of(&unwrap::UNNECESSARY_UNWRAP),
1703-
LintId::of(&upper_case_acronyms::UPPER_CASE_ACRONYMS),
17041704
LintId::of(&useless_conversion::USELESS_CONVERSION),
17051705
LintId::of(&vec::USELESS_VEC),
17061706
LintId::of(&vec_init_then_push::VEC_INIT_THEN_PUSH),
@@ -1819,7 +1819,6 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
18191819
LintId::of(&types::FN_TO_NUMERIC_CAST_WITH_TRUNCATION),
18201820
LintId::of(&unsafe_removed_from_name::UNSAFE_REMOVED_FROM_NAME),
18211821
LintId::of(&unused_unit::UNUSED_UNIT),
1822-
LintId::of(&upper_case_acronyms::UPPER_CASE_ACRONYMS),
18231822
LintId::of(&write::PRINTLN_EMPTY_STRING),
18241823
LintId::of(&write::PRINT_LITERAL),
18251824
LintId::of(&write::PRINT_WITH_NEWLINE),

clippy_lints/src/upper_case_acronyms.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ declare_clippy_lint! {
2929
/// struct HttpResponse;
3030
/// ```
3131
pub UPPER_CASE_ACRONYMS,
32-
style,
32+
pedantic,
3333
"capitalized acronyms are against the naming convention"
3434
}
3535

0 commit comments

Comments
 (0)