Skip to content

Commit daa4f0a

Browse files
flip1995Manishearth
authored andcommitted
Implement backwards compatibility changes introduced by rust-lang/rust#53762
1 parent d1f2f0c commit daa4f0a

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

clippy_lints/src/lib.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry<'_>, conf: &Conf) {
412412
reg.register_late_lint_pass(box non_copy_const::NonCopyConst);
413413
reg.register_late_lint_pass(box ptr_offset_with_cast::Pass);
414414

415-
reg.register_lint_group("clippy::restriction", vec![
415+
reg.register_lint_group("clippy::restriction", Some("clippy_restriction"), vec![
416416
arithmetic::FLOAT_ARITHMETIC,
417417
arithmetic::INTEGER_ARITHMETIC,
418418
else_if_without_else::ELSE_IF_WITHOUT_ELSE,
@@ -435,7 +435,7 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry<'_>, conf: &Conf) {
435435
write::USE_DEBUG,
436436
]);
437437

438-
reg.register_lint_group("clippy::pedantic", vec![
438+
reg.register_lint_group("clippy::pedantic", Some("clippy_pedantic"), vec![
439439
attrs::INLINE_ALWAYS,
440440
copies::MATCH_SAME_ARMS,
441441
copy_iterator::COPY_ITERATOR,
@@ -473,13 +473,13 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry<'_>, conf: &Conf) {
473473
use_self::USE_SELF,
474474
]);
475475

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

482-
reg.register_lint_group("clippy::all", vec![
482+
reg.register_lint_group("clippy::all", Some("clippy"), vec![
483483
approx_const::APPROX_CONSTANT,
484484
assign_ops::ASSIGN_OP_PATTERN,
485485
assign_ops::MISREFACTORED_ASSIGN_OP,
@@ -694,7 +694,7 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry<'_>, conf: &Conf) {
694694
zero_div_zero::ZERO_DIVIDED_BY_ZERO,
695695
]);
696696

697-
reg.register_lint_group("clippy::style", vec![
697+
reg.register_lint_group("clippy::style", Some("clippy_style"), vec![
698698
assign_ops::ASSIGN_OP_PATTERN,
699699
bit_mask::VERBOSE_BIT_MASK,
700700
blacklisted_name::BLACKLISTED_NAME,
@@ -778,7 +778,7 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry<'_>, conf: &Conf) {
778778
write::WRITELN_EMPTY_STRING,
779779
]);
780780

781-
reg.register_lint_group("clippy::complexity", vec![
781+
reg.register_lint_group("clippy::complexity", Some("clippy_complexity"), vec![
782782
assign_ops::MISREFACTORED_ASSIGN_OP,
783783
booleans::NONMINIMAL_BOOL,
784784
cyclomatic_complexity::CYCLOMATIC_COMPLEXITY,
@@ -846,7 +846,7 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry<'_>, conf: &Conf) {
846846
zero_div_zero::ZERO_DIVIDED_BY_ZERO,
847847
]);
848848

849-
reg.register_lint_group("clippy::correctness", vec![
849+
reg.register_lint_group("clippy::correctness", Some("clippy_correctness"), vec![
850850
approx_const::APPROX_CONSTANT,
851851
attrs::DEPRECATED_SEMVER,
852852
attrs::USELESS_ATTRIBUTE,
@@ -900,7 +900,7 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry<'_>, conf: &Conf) {
900900
unused_io_amount::UNUSED_IO_AMOUNT,
901901
]);
902902

903-
reg.register_lint_group("clippy::perf", vec![
903+
reg.register_lint_group("clippy::perf", Some("clippy_perf"), vec![
904904
bytecount::NAIVE_BYTECOUNT,
905905
entry::MAP_ENTRY,
906906
escape::BOXED_LOCAL,
@@ -918,11 +918,11 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry<'_>, conf: &Conf) {
918918
vec::USELESS_VEC,
919919
]);
920920

921-
reg.register_lint_group("clippy::cargo", vec![
921+
reg.register_lint_group("clippy::cargo", Some("clippy_cargo"), vec![
922922
multiple_crate_versions::MULTIPLE_CRATE_VERSIONS,
923923
]);
924924

925-
reg.register_lint_group("clippy::nursery", vec![
925+
reg.register_lint_group("clippy::nursery", Some("clippy_nursery"), vec![
926926
attrs::EMPTY_LINE_AFTER_OUTER_ATTR,
927927
fallible_impl_from::FALLIBLE_IMPL_FROM,
928928
mutex_atomic::MUTEX_INTEGER,

src/driver.rs

+2-2
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)