user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rollup merge of #135407 - joshtriplett:more-clippy, r=compiler-errors

Browse source 
Deny various clippy lints

Almost all of these clippy lints have zero occurrences. Two of them have one each, and this PR fixes those.
This commit is contained in:
Guillaume Gomez 2025-01-12 23:09:00 +01:00 • committed by GitHub
commit 80784f0f83
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 33 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
compiler/rustc_hir_typeck/src/fn_ctxt/checks.rs
View file

@ -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,
),
);

2
compiler/rustc_resolve/src/rustdoc.rs
View file

@ -347,7 +347,7 @@ pub fn strip_generics_from_path(path_str: &str) -> Result<Box<str>, 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

28
src/bootstrap/src/core/build_steps/clippy.rs
View file

@ -386,13 +386,37 @@ 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(),
"clippy::four_forward_slashes".into(),
"clippy::needless_bool".into(),
"clippy::needless_bool_assign".into(),
"clippy::non_minimal_cfg".into(),
"clippy::print_literal".into(),
"clippy::same_item_push".into(),
"clippy::single_char_add_str".into(),
"clippy::to_string_in_format_args".into(),
],
forbid: vec![],
};
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::char_lit_as_u8".into(),
"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(),
"clippy::print_literal".into(),
"clippy::same_item_push".into(),
"clippy::single_char_add_str".into(),
"clippy::to_string_in_format_args".into(),
],
forbid: vec![],
};