@@ -586,7 +586,6 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
586586 & large_stack_arrays:: LARGE_STACK_ARRAYS ,
587587 & len_zero:: LEN_WITHOUT_IS_EMPTY ,
588588 & len_zero:: LEN_ZERO ,
589- & returns:: LET_AND_RETURN ,
590589 & let_if_seq:: USELESS_LET_IF_SEQ ,
591590 & let_underscore:: LET_UNDERSCORE_LOCK ,
592591 & let_underscore:: LET_UNDERSCORE_MUST_USE ,
@@ -726,7 +725,6 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
726725 & needless_borrowed_ref:: NEEDLESS_BORROWED_REFERENCE ,
727726 & needless_continue:: NEEDLESS_CONTINUE ,
728727 & needless_pass_by_value:: NEEDLESS_PASS_BY_VALUE ,
729- & returns:: NEEDLESS_RETURN ,
730728 & needless_update:: NEEDLESS_UPDATE ,
731729 & neg_cmp_op_on_partial_ord:: NEG_CMP_OP_ON_PARTIAL_ORD ,
732730 & neg_multiply:: NEG_MULTIPLY ,
@@ -770,7 +768,8 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
770768 & regex:: INVALID_REGEX ,
771769 & regex:: TRIVIAL_REGEX ,
772770 & repeat_once:: REPEAT_ONCE ,
773- & unused_unit:: UNUSED_UNIT ,
771+ & returns:: LET_AND_RETURN ,
772+ & returns:: NEEDLESS_RETURN ,
774773 & serde_api:: SERDE_API_MISUSE ,
775774 & shadow:: SHADOW_REUSE ,
776775 & shadow:: SHADOW_SAME ,
@@ -840,6 +839,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
840839 & unsafe_removed_from_name:: UNSAFE_REMOVED_FROM_NAME ,
841840 & unused_io_amount:: UNUSED_IO_AMOUNT ,
842841 & unused_self:: UNUSED_SELF ,
842+ & unused_unit:: UNUSED_UNIT ,
843843 & unwrap:: PANICKING_UNWRAP ,
844844 & unwrap:: UNNECESSARY_UNWRAP ,
845845 & use_self:: USE_SELF ,
@@ -1284,7 +1284,6 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
12841284 LintId :: of( & large_enum_variant:: LARGE_ENUM_VARIANT ) ,
12851285 LintId :: of( & len_zero:: LEN_WITHOUT_IS_EMPTY ) ,
12861286 LintId :: of( & len_zero:: LEN_ZERO ) ,
1287- LintId :: of( & returns:: LET_AND_RETURN ) ,
12881287 LintId :: of( & let_underscore:: LET_UNDERSCORE_LOCK ) ,
12891288 LintId :: of( & lifetimes:: EXTRA_UNUSED_LIFETIMES ) ,
12901289 LintId :: of( & lifetimes:: NEEDLESS_LIFETIMES ) ,
@@ -1381,7 +1380,6 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
13811380 LintId :: of( & needless_bool:: BOOL_COMPARISON ) ,
13821381 LintId :: of( & needless_bool:: NEEDLESS_BOOL ) ,
13831382 LintId :: of( & needless_borrowed_ref:: NEEDLESS_BORROWED_REFERENCE ) ,
1384- LintId :: of( & returns:: NEEDLESS_RETURN ) ,
13851383 LintId :: of( & needless_update:: NEEDLESS_UPDATE ) ,
13861384 LintId :: of( & neg_cmp_op_on_partial_ord:: NEG_CMP_OP_ON_PARTIAL_ORD ) ,
13871385 LintId :: of( & neg_multiply:: NEG_MULTIPLY ) ,
@@ -1414,7 +1412,8 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
14141412 LintId :: of( & regex:: INVALID_REGEX ) ,
14151413 LintId :: of( & regex:: TRIVIAL_REGEX ) ,
14161414 LintId :: of( & repeat_once:: REPEAT_ONCE ) ,
1417- LintId :: of( & unused_unit:: UNUSED_UNIT ) ,
1415+ LintId :: of( & returns:: LET_AND_RETURN ) ,
1416+ LintId :: of( & returns:: NEEDLESS_RETURN ) ,
14181417 LintId :: of( & serde_api:: SERDE_API_MISUSE ) ,
14191418 LintId :: of( & single_component_path_imports:: SINGLE_COMPONENT_PATH_IMPORTS ) ,
14201419 LintId :: of( & slow_vector_initialization:: SLOW_VECTOR_INITIALIZATION ) ,
@@ -1460,6 +1459,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
14601459 LintId :: of( & unnecessary_sort_by:: UNNECESSARY_SORT_BY ) ,
14611460 LintId :: of( & unsafe_removed_from_name:: UNSAFE_REMOVED_FROM_NAME ) ,
14621461 LintId :: of( & unused_io_amount:: UNUSED_IO_AMOUNT ) ,
1462+ LintId :: of( & unused_unit:: UNUSED_UNIT ) ,
14631463 LintId :: of( & unwrap:: PANICKING_UNWRAP ) ,
14641464 LintId :: of( & unwrap:: UNNECESSARY_UNWRAP ) ,
14651465 LintId :: of( & useless_conversion:: USELESS_CONVERSION ) ,
@@ -1500,7 +1500,6 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
15001500 LintId :: of( & inherent_to_string:: INHERENT_TO_STRING ) ,
15011501 LintId :: of( & len_zero:: LEN_WITHOUT_IS_EMPTY ) ,
15021502 LintId :: of( & len_zero:: LEN_ZERO ) ,
1503- LintId :: of( & returns:: LET_AND_RETURN ) ,
15041503 LintId :: of( & literal_representation:: INCONSISTENT_DIGIT_GROUPING ) ,
15051504 LintId :: of( & loops:: EMPTY_LOOP ) ,
15061505 LintId :: of( & loops:: FOR_KV_MAP ) ,
@@ -1543,7 +1542,6 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
15431542 LintId :: of( & misc_early:: MIXED_CASE_HEX_LITERALS ) ,
15441543 LintId :: of( & misc_early:: REDUNDANT_PATTERN ) ,
15451544 LintId :: of( & mut_reference:: UNNECESSARY_MUT_PASSED ) ,
1546- LintId :: of( & returns:: NEEDLESS_RETURN ) ,
15471545 LintId :: of( & neg_multiply:: NEG_MULTIPLY ) ,
15481546 LintId :: of( & new_without_default:: NEW_WITHOUT_DEFAULT ) ,
15491547 LintId :: of( & non_expressive_names:: JUST_UNDERSCORES_AND_DIGITS ) ,
@@ -1555,7 +1553,8 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
15551553 LintId :: of( & redundant_field_names:: REDUNDANT_FIELD_NAMES ) ,
15561554 LintId :: of( & redundant_static_lifetimes:: REDUNDANT_STATIC_LIFETIMES ) ,
15571555 LintId :: of( & regex:: TRIVIAL_REGEX ) ,
1558- LintId :: of( & unused_unit:: UNUSED_UNIT ) ,
1556+ LintId :: of( & returns:: LET_AND_RETURN ) ,
1557+ LintId :: of( & returns:: NEEDLESS_RETURN ) ,
15591558 LintId :: of( & single_component_path_imports:: SINGLE_COMPONENT_PATH_IMPORTS ) ,
15601559 LintId :: of( & strings:: STRING_LIT_AS_BYTES ) ,
15611560 LintId :: of( & tabs_in_doc_comments:: TABS_IN_DOC_COMMENTS ) ,
@@ -1564,6 +1563,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
15641563 LintId :: of( & types:: FN_TO_NUMERIC_CAST ) ,
15651564 LintId :: of( & types:: FN_TO_NUMERIC_CAST_WITH_TRUNCATION ) ,
15661565 LintId :: of( & unsafe_removed_from_name:: UNSAFE_REMOVED_FROM_NAME ) ,
1566+ LintId :: of( & unused_unit:: UNUSED_UNIT ) ,
15671567 LintId :: of( & write:: PRINTLN_EMPTY_STRING ) ,
15681568 LintId :: of( & write:: PRINT_LITERAL ) ,
15691569 LintId :: of( & write:: PRINT_WITH_NEWLINE ) ,
0 commit comments