Run Clippy #2181

ada4a · 2025-09-14T15:12:26Z

For #1950

This turned out rather big... I'd like to make this easier to review, but I'm not sure how -- maybe split each lint's changes into its own commit?

Urgau · 2025-09-14T21:44:01Z

This turned out rather big... I'd like to make this easier to review, but I'm not sure how -- maybe split each lint's changes into its own commit?

If you can split into smaller commits, that would be great. Not necessarily each lint into it's own commit, bundling multiple lints changes is fine.

This is required for building `openssl-sys` on NixOS

Required for all the let-chains

clippy::{unused_lifetimes,elidable_lifetime_names}

clippy::{collapsible_match,unnested_or_patterns,match_same_arms}

takes up fewer lines

clippy::derivable_impls

clippy::{semicolon_if_nothing_returned,unnecessary_semicolon}

pointed out by `clippy::type_complexity`

clippy::{format_collect,format_push_string,useless_format}

much more concise

the `push` used to be conditional

clippy::{struct_field_names,upper_case_acronym}

ada4a · 2025-09-21T06:53:00Z

I did try to group related lints, but there were many small commits left from lints that I couldn't find a good group for -- hopefully, having the lint name on those commits will at least make their intent clear.

Urgau · 2025-09-21T16:17:16Z

Thanks for splitting into many commits, that will help a lot.

I will take a look at the PR in the next few weeks (I'm on vacation for the next two weeks).

Urgau

This looks pretty good. Thanks for doing that.

Left some changes and a few nits.

View changes since this review

Urgau · 2025-09-27T15:55:17Z

flake.nix

Could you remove the Nix changes from this PR, we are discussing those at #2179.

Urgau · 2025-09-27T16:03:42Z

src/gh_range_diff.rs

-            let diffs_and_inputs: Vec<_> = before
-                .into_iter()
-                .zip(after.into_iter())
+            let diffs_and_inputs: Vec<_> = iter::zip(before, after)


This is very pedantic 😄

I must admit this one isn't even a Clippy lint, but rather a personal preference:

I've often found the formatting of .zip to be suboptimal, where, especially when the to-be zipped iterators were built as a method chain of iterator adapters, they would get split up across many lines, making it hard to see what exactly we're zipping. For example, something like this:
left .iter() .enumerate() .zip(right.into_iter().map(|x| x + 2))
Is imo much more understandable when written like this:
iter::zip( left.iter().enumerate() right.into_iter().map(|x| x + 2) )

And as shown in this particular case, iter::zip allows for replacing the explicit x.iter() with &x, and removing .into_iter() entirely, which I also find pretty nice.

But again, this change in particular doesn't bring us closer to long-term goal behind this PR (have Clippy run as part of CI), so I could just remove it..

I have no preference for either, so I'm fine with keeping your version.

Urgau · 2025-09-27T16:14:35Z

src/handlers/major_change.rs

        let comment = format!(
-            r#"> [!IMPORTANT]
-> This issue is *not meant to be used for technical discussion*. There is a **Zulip [stream]** for that.
-> Use this issue to leave procedural comments, such as volunteering to review, indicating that you second the proposal (or third, etc), or raising a concern that you would like to be addressed.
-
-<details>
-<summary>Concerns or objections can formally be registered here by adding a comment.</summary>
-<p>
-
-```
-@rustbot concern reason-for-concern
-<description of the concern>
-```
-Concerns can be lifted with:
-```
-@rustbot resolve reason-for-concern
-```
-See documentation at [https://forge.rust-lang.org](https://forge.rust-lang.org/compiler/proposals-and-stabilization.html#what-kinds-of-comments-should-go-on-a-mcp-in-the-compiler-team-repo)
-
-</p>
-</details>
-{}
-
-[stream]: {topic_url}"#,
+            r"> [!IMPORTANT]
+        > This issue is *not meant to be used for technical discussion*. There is a **Zulip [stream]** for that.
+        > Use this issue to leave procedural comments, such as volunteering to review, indicating that you second the proposal (or third, etc), or raising a concern that you would like to be addressed.
+
+        <details>
+        <summary>Concerns or objections can formally be registered here by adding a comment.</summary>
+        <p>
+
+        ```
+        @rustbot concern reason-for-concern
+        <description of the concern>
+        ```
+        Concerns can be lifted with:
+        ```
+        @rustbot resolve reason-for-concern
+        ```
+        See documentation at [https://forge.rust-lang.org](https://forge.rust-lang.org/compiler/proposals-and-stabilization.html#what-kinds-of-comments-should-go-on-a-mcp-in-the-compiler-team-repo)
+
+        </p>
+        </details>
+        {}
+
+        [stream]: {topic_url}",
            config.open_extra_text.as_deref().unwrap_or_default(),


Is this actually the same thing? The other ones were not indented.

Oh, no, sorry, that's an annoying bug in the Git merge driver that I'm co-developing – I really should get to fixing it...

Urgau · 2025-09-27T16:22:35Z

src/handlers/check_commits/issue_links.rs

-        .map(|c| format!("- {}\n", c.sha))
-        .collect::<String>();
+        .fold(String::new(), |mut commits, c| {
+            _ = writeln!(commits, "- {}", c.sha);
+            commits
+        });


Unsure about clippy::format_collect, I'm not finding it particularly more readable compared to before, and it's not like this code is perf sensitive anyway.

Yeah, you're right -- not to mention that clippy::format_collect is pedantic.

I could theoretically use Itertools::format_with instead:

.format_with("\n", |c, f| f(&format_args!("- {}", c.sha))) .to_string();

But it's also not the most readable imo. WDYT?

Yeah, I also don't find it more readable IMO.

src/github.rs

Urgau · 2025-09-27T16:29:08Z

src/github.rs

-        write!(f, "Unknown labels: {}", &self.labels.join(", "))
+        write!(f, "Unknown labels: {}", self.labels.iter().format(", "))


Hum, I'm not finding this iter().format(...) dance better than .join(...). I'm not sure it's worth it.

Fair enough. I removed all the instances where the .iter()/.into_iter() was needed, leaving only those where we already were working with an iterator.

Urgau · 2025-09-27T16:34:44Z

src/rfcbot.rs


 #[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct FCP {
+pub struct Fcp {


FCP is the correct name, it stands for Final Comment Period, it should not be lower-cased.

I'm aware^^ This is from clippy::upper_case_acronyms, which specifically targets acronyms

Urgau · 2025-09-27T16:34:53Z

src/rfcbot.rs

 }
 #[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct FCPIssue {
+pub struct FcpIssue {


Urgau · 2025-09-27T16:35:03Z

src/rfcbot.rs

 #[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct FullFCP {
-    pub fcp: FCP,
+pub struct FullFcp {


Urgau · 2025-09-27T16:36:41Z

src/gh_range_diff.rs


 impl HtmlDiffPrinter<'_> {
    fn handle_hunk_line<'a>(
-        &self,


Can we just allow clippy::unused_self here, we may use &self here in the future.

Urgau · 2025-09-27T16:40:22Z

src/rfcbot.rs

-    pub fcp_start: Option<String>,
-    pub fcp_closed: bool,
+    pub start: Option<String>,
+    pub closed: bool,


Those field name changes needs to be reverted, the are coming from a API, they need to stay the same as the api.

ada4a force-pushed the lints branch from 04b7659 to 91ad704 Compare September 14, 2025 15:14

ada4a added 28 commits September 15, 2025 23:40

Add Nix flake

daa1e8d

This is required for building `openssl-sys` on NixOS

parser: bump edition to 2024

f82b3c2

Required for all the let-chains

unused/elidable lifetimes

deb5439

clippy::{unused_lifetimes,elidable_lifetime_names}

redundant refs/derefs

5b2c130

clippy::uninlined_format_args

8a7c9f7

clippy::if_not_else

b094757

clippy::needless_return

659d85e

explicit iterator loops

8df056e

clippy::useless_conversion

52d5270

simplify thanks to the previous commit

258e3b7

simplify matches

60602d0

clippy::{collapsible_match,unnested_or_patterns,match_same_arms}

use std::iter::zip

88731ed

takes up fewer lines

clippy::inefficient_to_string

82259d8

clippy::ignored_unit_patterns

ef55ea7

derive Default for IssueLinksCheckCommitsConfig

69cb114

clippy::derivable_impls

use more idiomatic iterator/Option adaptors

8760f36

clean-up consts

32ea017

use let-else

778ba02

clippy::cast_lossless

031aa5d

documentation lints

554289e

reborrow instead of slicing

d978fc5

add/remove semicolons

d15c931

clippy::{semicolon_if_nothing_returned,unnecessary_semicolon}

clippy::write_with_newline

b331922

clippy::manual_string_new

38ba2dd

clippy::single_char_pattern

c27e100

clippy::implicit_clone

9989a85

get command without unwrapping

93a80e0

write! _inside_ match

1da5e71

ada4a added 25 commits September 17, 2025 01:10

clippy::redundant_closure_for_method_calls

efdd2a8

clippy::manual_is_variant_and

f846986

clippy::needless_raw_string_hashes

6ba8cc3

clippy::question_mark

5ed9adf

construct HashMap from array

41bde06

clippy::collapsible{,_else}_if

bc1d4ab

use Result::ok_or for trying out multiple things

ea0801a

use as_deref to avoid allocating a String

05ecbd4

RustcFormat::store_version: take params by reference

2d19376

config: introduce MaybeConfig type alias

4ea6b20

pointed out by `clippy::type_complexity`

avoid eager/useless format!s

42e4037

clippy::{format_collect,format_push_string,useless_format}

replace std::iter::once(_) with [_]

8018914

much more concise

use Itertools::format

93ad1fa

replace .ok_or_else(|| anyhow::anyhow! with .context(

5930e34

don't destructure tuple for comparison

3a1133f

expect some lints

929f3d4

clippy::field_reassign_with_default

cee3a6a

clippy::vec_init_then_push

284ba8c

the `push` used to be conditional

avoid clippy::partialeq_to_none

ac4d7df

clippy::manual_find

b722c5f

clippy::ptr_arg

4382423

deref Label to &str directly

7443c6c

clippy::redundant_pattern_matching

8031a82

lints on FCP-related items

9b541d0

clippy::{struct_field_names,upper_case_acronym}

clippy::unused_self

45d88f8

ada4a force-pushed the lints branch from 91ad704 to 45d88f8 Compare September 21, 2025 06:50

Urgau reviewed Sep 27, 2025

View reviewed changes

		write!(f, "Unknown labels: {}", &self.labels.join(", "))
		write!(f, "Unknown labels: {}", self.labels.iter().format(", "))

Run Clippy #2181

Are you sure you want to change the base?

Run Clippy #2181

Uh oh!

Conversation

ada4a commented Sep 14, 2025

Uh oh!

Urgau commented Sep 14, 2025

Uh oh!

ada4a commented Sep 21, 2025

Uh oh!

Urgau commented Sep 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Urgau left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Urgau Sep 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Urgau commented Sep 21, 2025 •

edited

Loading

Urgau left a comment •

edited by rustbot

Loading

Urgau Sep 27, 2025 •

edited

Loading