Skip to content

Deny various clippy lints #135407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Jan 13, 2025
Merged

Deny various clippy lints #135407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e54264c
Deny `clippy::format_in_format_args` and fix the only occurrence
joshtriplett Jan 12, 2025
9c5b99d
Deny `clippy:;four_forward_slashes` and fix the only occurrence
joshtriplett Jan 12, 2025
3b262bd
Deny `clippy::char_lit_as_u8` (no occurrences)
joshtriplett Jan 12, 2025
fc683cb
Deny `clippy::non_minimal_cfg` (no occurrences)
joshtriplett Jan 12, 2025
e6056b5
Deny `clippy::needless_bool` and `clippy::needless_bool_assign` (no o…
joshtriplett Jan 12, 2025
132e640
Deny `clippy::print_literal` (no occurrences)
joshtriplett Jan 12, 2025
57fcee8
Deny `clippy::same_item_push` (no occurrences)
joshtriplett Jan 12, 2025
fb2e706
Deny `clippy::single_char_add_str` (no occurrences)
joshtriplett Jan 12, 2025
fcc7803
Deny `clippy::to_string_in_format_args` (no occurrences)
joshtriplett Jan 12, 2025
af7bc31
Deny `clippy::four_forward_slashes` in library (no occurrences)
joshtriplett Jan 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions compiler/rustc_hir_typeck/src/fn_ctxt/checks.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
),
);
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_resolve/src/rustdoc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
28 changes: 26 additions & 2 deletions src/bootstrap/src/core/build_steps/clippy.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,13 +385,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![],
};

Expand Down
Loading