Skip to content

Commit 4f1e3f4

Browse files
committed
Implement backwards compatibility changes introduced by rust-lang/rust#53762
1 parent b4d31f4 commit 4f1e3f4

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

clippy_lints/src/lib.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry<'_>, conf: &Conf) {
410410
reg.register_late_lint_pass(box indexing_slicing::IndexingSlicing);
411411
reg.register_late_lint_pass(box non_copy_const::NonCopyConst);
412412

413-
reg.register_lint_group("clippy::restriction", vec![
413+
reg.register_lint_group("clippy::restriction", Some("clippy_restriction"), vec![
414414
arithmetic::FLOAT_ARITHMETIC,
415415
arithmetic::INTEGER_ARITHMETIC,
416416
else_if_without_else::ELSE_IF_WITHOUT_ELSE,
@@ -433,7 +433,7 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry<'_>, conf: &Conf) {
433433
write::USE_DEBUG,
434434
]);
435435

436-
reg.register_lint_group("clippy::pedantic", vec![
436+
reg.register_lint_group("clippy::pedantic", Some("clippy_pedantic"), vec![
437437
attrs::INLINE_ALWAYS,
438438
copies::MATCH_SAME_ARMS,
439439
copy_iterator::COPY_ITERATOR,
@@ -471,13 +471,13 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry<'_>, conf: &Conf) {
471471
use_self::USE_SELF,
472472
]);
473473

474-
reg.register_lint_group("clippy::internal", vec![
474+
reg.register_lint_group("clippy::internal", Some("clippy_internal"), vec![
475475
utils::internal_lints::CLIPPY_LINTS_INTERNAL,
476476
utils::internal_lints::LINT_WITHOUT_LINT_PASS,
477477
utils::internal_lints::DEFAULT_HASH_TYPES,
478478
]);
479479

480-
reg.register_lint_group("clippy::all", vec![
480+
reg.register_lint_group("clippy::all", Some("clippy"), vec![
481481
approx_const::APPROX_CONSTANT,
482482
assign_ops::ASSIGN_OP_PATTERN,
483483
assign_ops::MISREFACTORED_ASSIGN_OP,
@@ -691,7 +691,7 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry<'_>, conf: &Conf) {
691691
zero_div_zero::ZERO_DIVIDED_BY_ZERO,
692692
]);
693693

694-
reg.register_lint_group("clippy::style", vec![
694+
reg.register_lint_group("clippy::style", Some("clippy_style"), vec![
695695
assign_ops::ASSIGN_OP_PATTERN,
696696
bit_mask::VERBOSE_BIT_MASK,
697697
blacklisted_name::BLACKLISTED_NAME,
@@ -775,7 +775,7 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry<'_>, conf: &Conf) {
775775
write::WRITELN_EMPTY_STRING,
776776
]);
777777

778-
reg.register_lint_group("clippy::complexity", vec![
778+
reg.register_lint_group("clippy::complexity", Some("clippy_complexity"), vec![
779779
assign_ops::MISREFACTORED_ASSIGN_OP,
780780
booleans::NONMINIMAL_BOOL,
781781
cyclomatic_complexity::CYCLOMATIC_COMPLEXITY,
@@ -842,7 +842,7 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry<'_>, conf: &Conf) {
842842
zero_div_zero::ZERO_DIVIDED_BY_ZERO,
843843
]);
844844

845-
reg.register_lint_group("clippy::correctness", vec![
845+
reg.register_lint_group("clippy::correctness", Some("clippy_correctness"), vec![
846846
approx_const::APPROX_CONSTANT,
847847
attrs::DEPRECATED_SEMVER,
848848
attrs::USELESS_ATTRIBUTE,
@@ -896,7 +896,7 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry<'_>, conf: &Conf) {
896896
unused_io_amount::UNUSED_IO_AMOUNT,
897897
]);
898898

899-
reg.register_lint_group("clippy::perf", vec![
899+
reg.register_lint_group("clippy::perf", Some("clippy_perf"), vec![
900900
bytecount::NAIVE_BYTECOUNT,
901901
entry::MAP_ENTRY,
902902
escape::BOXED_LOCAL,
@@ -914,11 +914,11 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry<'_>, conf: &Conf) {
914914
vec::USELESS_VEC,
915915
]);
916916

917-
reg.register_lint_group("clippy::cargo", vec![
917+
reg.register_lint_group("clippy::cargo", Some("clippy_cargo"), vec![
918918
multiple_crate_versions::MULTIPLE_CRATE_VERSIONS,
919919
]);
920920

921-
reg.register_lint_group("clippy::nursery", vec![
921+
reg.register_lint_group("clippy::nursery", Some("clippy_nursery"), vec![
922922
attrs::EMPTY_LINE_AFTER_OUTER_ATTR,
923923
fallible_impl_from::FALLIBLE_IMPL_FROM,
924924
mutex_atomic::MUTEX_INTEGER,

src/driver.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ pub fn main() {
119119
ls.register_late_pass(Some(sess), true, pass);
120120
}
121121

122-
for (name, to) in lint_groups {
123-
ls.register_group(Some(sess), true, name, to);
122+
for (name, (to, deprecated_name)) in lint_groups {
123+
ls.register_group(Some(sess), true, name, deprecated_name, to);
124124
}
125125
clippy_lints::register_pre_expansion_lints(sess, &mut ls, &conf);
126126

0 commit comments

Comments
 (0)