From e54264c509ae6a93f0b1f1b2d36f7c9aabc5e681 Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Sun, 12 Jan 2025 15:05:46 +0200 Subject: [PATCH 01/10] Deny `clippy::format_in_format_args` and fix the only occurrence --- compiler/rustc_hir_typeck/src/fn_ctxt/checks.rs | 15 ++++++--------- src/bootstrap/src/core/build_steps/clippy.rs | 6 +++++- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/compiler/rustc_hir_typeck/src/fn_ctxt/checks.rs b/compiler/rustc_hir_typeck/src/fn_ctxt/checks.rs index 2f4b42587fb25..46eed2db2364f 100644 --- a/compiler/rustc_hir_typeck/src/fn_ctxt/checks.rs +++ b/compiler/rustc_hir_typeck/src/fn_ctxt/checks.rs @@ -2460,16 +2460,13 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> { spans.push_span_label( param.span, format!( - "{} {} to match the {} type of this parameter", + "{} need{} to match the {} type of this parameter", display_list_with_comma_and(&other_param_matched_names), - format!( - "need{}", - pluralize!(if other_param_matched_names.len() == 1 { - 0 - } else { - 1 - }) - ), + pluralize!(if other_param_matched_names.len() == 1 { + 0 + } else { + 1 + }), matched_ty, ), ); diff --git a/src/bootstrap/src/core/build_steps/clippy.rs b/src/bootstrap/src/core/build_steps/clippy.rs index 518db156fea97..4d124cefa1d95 100644 --- a/src/bootstrap/src/core/build_steps/clippy.rs +++ b/src/bootstrap/src/core/build_steps/clippy.rs @@ -391,7 +391,11 @@ impl Step for CI { let compiler_clippy_cfg = LintConfig { allow: vec!["clippy::all".into()], warn: vec![], - deny: vec!["clippy::correctness".into(), "clippy::clone_on_ref_ptr".into()], + deny: vec![ + "clippy::correctness".into(), + "clippy::clone_on_ref_ptr".into(), + "clippy::format_in_format_args".into(), + ], forbid: vec![], }; From 9c5b99dc92005d52d7b877f8501bc90da767c5df Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Sun, 12 Jan 2025 15:06:44 +0200 Subject: [PATCH 02/10] Deny `clippy:;four_forward_slashes` and fix the only occurrence --- compiler/rustc_resolve/src/rustdoc.rs | 2 +- src/bootstrap/src/core/build_steps/clippy.rs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/compiler/rustc_resolve/src/rustdoc.rs b/compiler/rustc_resolve/src/rustdoc.rs index 84e43d0e01660..7998596c59eff 100644 --- a/compiler/rustc_resolve/src/rustdoc.rs +++ b/compiler/rustc_resolve/src/rustdoc.rs @@ -347,7 +347,7 @@ pub fn strip_generics_from_path(path_str: &str) -> Result, MalformedGen /// Returns whether the first doc-comment is an inner attribute. /// -//// If there are no doc-comments, return true. +/// If there are no doc-comments, return true. /// FIXME(#78591): Support both inner and outer attributes on the same item. pub fn inner_docs(attrs: &[impl AttributeExt]) -> bool { attrs diff --git a/src/bootstrap/src/core/build_steps/clippy.rs b/src/bootstrap/src/core/build_steps/clippy.rs index 4d124cefa1d95..57efdaf3113f0 100644 --- a/src/bootstrap/src/core/build_steps/clippy.rs +++ b/src/bootstrap/src/core/build_steps/clippy.rs @@ -395,6 +395,7 @@ impl Step for CI { "clippy::correctness".into(), "clippy::clone_on_ref_ptr".into(), "clippy::format_in_format_args".into(), + "clippy::four_forward_slashes".into(), ], forbid: vec![], }; From 3b262bdf24b17df602a94815ad3135882c99183d Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Sun, 12 Jan 2025 15:11:58 +0200 Subject: [PATCH 03/10] Deny `clippy::char_lit_as_u8` (no occurrences) --- src/bootstrap/src/core/build_steps/clippy.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/bootstrap/src/core/build_steps/clippy.rs b/src/bootstrap/src/core/build_steps/clippy.rs index 57efdaf3113f0..3588e5a760052 100644 --- a/src/bootstrap/src/core/build_steps/clippy.rs +++ b/src/bootstrap/src/core/build_steps/clippy.rs @@ -385,7 +385,10 @@ impl Step for CI { let library_clippy_cfg = LintConfig { allow: vec!["clippy::all".into()], warn: vec![], - deny: vec!["clippy::correctness".into()], + deny: vec![ + "clippy::correctness".into(), + "clippy::char_lit_as_u8".into(), + ], forbid: vec![], }; let compiler_clippy_cfg = LintConfig { @@ -393,6 +396,7 @@ impl Step for CI { warn: vec![], deny: vec![ "clippy::correctness".into(), + "clippy::char_lit_as_u8".into(), "clippy::clone_on_ref_ptr".into(), "clippy::format_in_format_args".into(), "clippy::four_forward_slashes".into(), From fc683cbc0ee05e4d00195b87bee7ea9c963afa06 Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Sun, 12 Jan 2025 15:15:49 +0200 Subject: [PATCH 04/10] Deny `clippy::non_minimal_cfg` (no occurrences) --- src/bootstrap/src/core/build_steps/clippy.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bootstrap/src/core/build_steps/clippy.rs b/src/bootstrap/src/core/build_steps/clippy.rs index 3588e5a760052..a94ab22a0d1c1 100644 --- a/src/bootstrap/src/core/build_steps/clippy.rs +++ b/src/bootstrap/src/core/build_steps/clippy.rs @@ -388,6 +388,7 @@ impl Step for CI { deny: vec![ "clippy::correctness".into(), "clippy::char_lit_as_u8".into(), + "clippy::non_minimal_cfg".into(), ], forbid: vec![], }; @@ -400,6 +401,7 @@ impl Step for CI { "clippy::clone_on_ref_ptr".into(), "clippy::format_in_format_args".into(), "clippy::four_forward_slashes".into(), + "clippy::non_minimal_cfg".into(), ], forbid: vec![], }; From e6056b54cfc3fe2cf5eddfdee7daf954577fe107 Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Sun, 12 Jan 2025 15:17:29 +0200 Subject: [PATCH 05/10] Deny `clippy::needless_bool` and `clippy::needless_bool_assign` (no occurrences) --- src/bootstrap/src/core/build_steps/clippy.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/bootstrap/src/core/build_steps/clippy.rs b/src/bootstrap/src/core/build_steps/clippy.rs index a94ab22a0d1c1..07b9affc16eb2 100644 --- a/src/bootstrap/src/core/build_steps/clippy.rs +++ b/src/bootstrap/src/core/build_steps/clippy.rs @@ -388,6 +388,8 @@ impl Step for CI { deny: vec![ "clippy::correctness".into(), "clippy::char_lit_as_u8".into(), + "clippy::needless_bool".into(), + "clippy::needless_bool_assign".into(), "clippy::non_minimal_cfg".into(), ], forbid: vec![], @@ -401,6 +403,8 @@ impl Step for CI { "clippy::clone_on_ref_ptr".into(), "clippy::format_in_format_args".into(), "clippy::four_forward_slashes".into(), + "clippy::needless_bool".into(), + "clippy::needless_bool_assign".into(), "clippy::non_minimal_cfg".into(), ], forbid: vec![], From 132e640fbfb55e4fb3b6af8ff9ccd95d449361fe Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Sun, 12 Jan 2025 15:22:06 +0200 Subject: [PATCH 06/10] Deny `clippy::print_literal` (no occurrences) --- src/bootstrap/src/core/build_steps/clippy.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bootstrap/src/core/build_steps/clippy.rs b/src/bootstrap/src/core/build_steps/clippy.rs index 07b9affc16eb2..18ce81251b54b 100644 --- a/src/bootstrap/src/core/build_steps/clippy.rs +++ b/src/bootstrap/src/core/build_steps/clippy.rs @@ -391,6 +391,7 @@ impl Step for CI { "clippy::needless_bool".into(), "clippy::needless_bool_assign".into(), "clippy::non_minimal_cfg".into(), + "clippy::print_literal".into(), ], forbid: vec![], }; @@ -406,6 +407,7 @@ impl Step for CI { "clippy::needless_bool".into(), "clippy::needless_bool_assign".into(), "clippy::non_minimal_cfg".into(), + "clippy::print_literal".into(), ], forbid: vec![], }; From 57fcee8655485c30be5288914331f856c8d1a2ba Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Sun, 12 Jan 2025 15:24:29 +0200 Subject: [PATCH 07/10] Deny `clippy::same_item_push` (no occurrences) --- src/bootstrap/src/core/build_steps/clippy.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bootstrap/src/core/build_steps/clippy.rs b/src/bootstrap/src/core/build_steps/clippy.rs index 18ce81251b54b..299eddd52a8c5 100644 --- a/src/bootstrap/src/core/build_steps/clippy.rs +++ b/src/bootstrap/src/core/build_steps/clippy.rs @@ -392,6 +392,7 @@ impl Step for CI { "clippy::needless_bool_assign".into(), "clippy::non_minimal_cfg".into(), "clippy::print_literal".into(), + "clippy::same_item_push".into(), ], forbid: vec![], }; @@ -408,6 +409,7 @@ impl Step for CI { "clippy::needless_bool_assign".into(), "clippy::non_minimal_cfg".into(), "clippy::print_literal".into(), + "clippy::same_item_push".into(), ], forbid: vec![], }; From fb2e70690b82408c1d4dc20e32f2e005fba65cfd Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Sun, 12 Jan 2025 15:26:24 +0200 Subject: [PATCH 08/10] Deny `clippy::single_char_add_str` (no occurrences) --- src/bootstrap/src/core/build_steps/clippy.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bootstrap/src/core/build_steps/clippy.rs b/src/bootstrap/src/core/build_steps/clippy.rs index 299eddd52a8c5..22d4049480b59 100644 --- a/src/bootstrap/src/core/build_steps/clippy.rs +++ b/src/bootstrap/src/core/build_steps/clippy.rs @@ -393,6 +393,7 @@ impl Step for CI { "clippy::non_minimal_cfg".into(), "clippy::print_literal".into(), "clippy::same_item_push".into(), + "clippy::single_char_add_str".into(), ], forbid: vec![], }; @@ -410,6 +411,7 @@ impl Step for CI { "clippy::non_minimal_cfg".into(), "clippy::print_literal".into(), "clippy::same_item_push".into(), + "clippy::single_char_add_str".into(), ], forbid: vec![], }; From fcc7803822dcb3ff09ec56c858293889ab165d2b Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Sun, 12 Jan 2025 15:29:56 +0200 Subject: [PATCH 09/10] Deny `clippy::to_string_in_format_args` (no occurrences) --- src/bootstrap/src/core/build_steps/clippy.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bootstrap/src/core/build_steps/clippy.rs b/src/bootstrap/src/core/build_steps/clippy.rs index 22d4049480b59..a6c95e5969512 100644 --- a/src/bootstrap/src/core/build_steps/clippy.rs +++ b/src/bootstrap/src/core/build_steps/clippy.rs @@ -394,6 +394,7 @@ impl Step for CI { "clippy::print_literal".into(), "clippy::same_item_push".into(), "clippy::single_char_add_str".into(), + "clippy::to_string_in_format_args".into(), ], forbid: vec![], }; @@ -412,6 +413,7 @@ impl Step for CI { "clippy::print_literal".into(), "clippy::same_item_push".into(), "clippy::single_char_add_str".into(), + "clippy::to_string_in_format_args".into(), ], forbid: vec![], }; From af7bc3158a3d298490c6792b88a9f13152b899f8 Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Sun, 12 Jan 2025 15:58:01 +0200 Subject: [PATCH 10/10] Deny `clippy::four_forward_slashes` in library (no occurrences) --- src/bootstrap/src/core/build_steps/clippy.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bootstrap/src/core/build_steps/clippy.rs b/src/bootstrap/src/core/build_steps/clippy.rs index a6c95e5969512..bf915a795f941 100644 --- a/src/bootstrap/src/core/build_steps/clippy.rs +++ b/src/bootstrap/src/core/build_steps/clippy.rs @@ -388,6 +388,7 @@ impl Step for CI { deny: vec![ "clippy::correctness".into(), "clippy::char_lit_as_u8".into(), + "clippy::four_forward_slashes".into(), "clippy::needless_bool".into(), "clippy::needless_bool_assign".into(), "clippy::non_minimal_cfg".into(),