Fix some tidy paper cuts #139867

WaffleLapkin · 2025-04-15T13:08:34Z

The main thing this fixes is that currently, if you run x t tidy it will format ~6K files, even though it's supposed to format only modified files (whatever this is a useful optimization or not is besides the point). The problem is that x t tidy never writes the rustfmt stamp, so it always assumes rustfmt that was last used is outdated and we need to recheck everything. This PR fixes it by actually writing the stamp.

There are also some minor tweaks to comments/diagnostics. cc @Kobzol this probably conflicts with #138591. I didn't fix anything, just tried to document better the status quo.

r? @jieyouxu

I feel like they are still wrong, but maybe less so .-. The `info:` was unhelpful -- we only use upstream in CI nowdays.

rustbot · 2025-04-15T13:08:41Z

The list of allowed third-party dependencies may have been modified! You must ensure that any new dependencies have compatible licenses before merging.

cc @davidtwco, @wesleywiser

jieyouxu

Changes seem reasonable to me, and running this locally seems to do what I expect. r=me unless Jakub has change requests.

jieyouxu · 2025-04-15T13:26:26Z

r? @Kobzol (in case you have requests re. #138591)

Kobzol

Left one comment, otherwise fine. Some of the git comments will be obsolete after #138591, but that doesn't really matter.

Kobzol · 2025-04-15T13:59:28Z

src/bootstrap/src/core/build_steps/format.rs

-        update_rustfmt_version(build);
-    }
+    // Update `build/.rustfmt-stamp`, allowing this code to ignore files which has not been changed
+    // since last merge. This is similar to what `x fmt` does.


This is a bit misleading, because this function is actually called from x fmt.

Oh, I did not realize that! I just removed the sentence about x fmt.

If checking succeeded, it's equivalent to successfully formatting.

WaffleLapkin · 2025-04-15T19:54:24Z

@bors r=jieyouxu

bors · 2025-04-15T19:54:27Z

📌 Commit 90aec13 has been approved by jieyouxu

It is now in the queue for this repository.

Fix some tidy paper cuts The main thing this fixes is that currently, if you run `x t tidy` it will format ~6K files, even though it's supposed to format only modified files (whatever this is a useful optimization or not is besides the point). The problem is that `x t tidy` never writes the `rustfmt` stamp, so it always assumes `rustfmt` that was last used is outdated and we need to recheck everything. This PR fixes it by actually writing the stamp. There are also some minor tweaks to comments/diagnostics. cc `@Kobzol` this probably conflicts with rust-lang#138591. I didn't fix anything, just tried to document better the status quo. r? `@jieyouxu`

Rollup of 8 pull requests Successful merges: - rust-lang#136926 (Stabilize `-Zdwarf-version` as `-Cdwarf-version`) - rust-lang#139647 (Add unstable parsing of `--extern foo::bar=libbar.rlib` command line options) - rust-lang#139853 (Disable combining LLD with external llvm-config) - rust-lang#139867 (Fix some tidy paper cuts) - rust-lang#139871 (Fix wrong "move keyword" suggestion for async gen block) - rust-lang#139880 (Don't compute name of associated item if it's an RPITIT) - rust-lang#139884 (Update books) - rust-lang#139886 (`borrowck_graphviz_*` attribute tweaks) r? `@ghost` `@rustbot` modify labels: rollup

Fix some tidy paper cuts The main thing this fixes is that currently, if you run `x t tidy` it will format ~6K files, even though it's supposed to format only modified files (whatever this is a useful optimization or not is besides the point). The problem is that `x t tidy` never writes the `rustfmt` stamp, so it always assumes `rustfmt` that was last used is outdated and we need to recheck everything. This PR fixes it by actually writing the stamp. There are also some minor tweaks to comments/diagnostics. cc ``@Kobzol`` this probably conflicts with rust-lang#138591. I didn't fix anything, just tried to document better the status quo. r? ``@jieyouxu``

Rollup of 10 pull requests Successful merges: - rust-lang#139647 (Add unstable parsing of `--extern foo::bar=libbar.rlib` command line options) - rust-lang#139823 (Fix some bootstrap papercuts) - rust-lang#139853 (Disable combining LLD with external llvm-config) - rust-lang#139867 (Fix some tidy paper cuts) - rust-lang#139871 (Fix wrong "move keyword" suggestion for async gen block) - rust-lang#139876 (Make CodeStats' type_sizes public) - rust-lang#139880 (Don't compute name of associated item if it's an RPITIT) - rust-lang#139884 (Update books) - rust-lang#139886 (`borrowck_graphviz_*` attribute tweaks) - rust-lang#139893 (Add test for issue 125668) r? `@ghost` `@rustbot` modify labels: rollup

…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#139647 (Add unstable parsing of `--extern foo::bar=libbar.rlib` command line options) - rust-lang#139823 (Fix some bootstrap papercuts) - rust-lang#139867 (Fix some tidy paper cuts) - rust-lang#139871 (Fix wrong "move keyword" suggestion for async gen block) - rust-lang#139876 (Make CodeStats' type_sizes public) - rust-lang#139880 (Don't compute name of associated item if it's an RPITIT) - rust-lang#139884 (Update books) - rust-lang#139886 (`borrowck_graphviz_*` attribute tweaks) - rust-lang#139893 (Add test for issue 125668) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#139867 - WaffleLapkin:tidypaper, r=jieyouxu Fix some tidy paper cuts The main thing this fixes is that currently, if you run `x t tidy` it will format ~6K files, even though it's supposed to format only modified files (whatever this is a useful optimization or not is besides the point). The problem is that `x t tidy` never writes the `rustfmt` stamp, so it always assumes `rustfmt` that was last used is outdated and we need to recheck everything. This PR fixes it by actually writing the stamp. There are also some minor tweaks to comments/diagnostics. cc ```@Kobzol``` this probably conflicts with rust-lang#138591. I didn't fix anything, just tried to document better the status quo. r? ```@jieyouxu```

Kobzol · 2025-04-17T07:58:13Z

x fmt is wonderfully fast now, thanks!

WaffleLapkin · 2025-04-17T13:06:48Z

@Kobzol I don't think this changed x fmt, right? for x fmt checked = false so we would commit the stump even before this.

but ur welcome :)

Kobzol · 2025-04-17T13:09:46Z

Hmm, maybe it was confirmation bias =D But tidy felt faster too :)

WaffleLapkin added 4 commits April 15, 2025 15:01

tidy: don't crush on non-existent submodules

502b630

use helper function instead of writing rustfmt stamp by hand

52f4b16

slightly correct comments and diagnostics about checking modifications

dda4d7b

I feel like they are still wrong, but maybe less so .-. The `info:` was unhelpful -- we only use upstream in CI nowdays.

add a comment for code that isn't

8934ac5

rustbot assigned jieyouxu Apr 15, 2025

rustbot added A-tidy S-waiting-on-review T-bootstrap labels Apr 15, 2025

jieyouxu approved these changes Apr 15, 2025

View reviewed changes

rustbot assigned Kobzol and unassigned jieyouxu Apr 15, 2025

Kobzol reviewed Apr 15, 2025

View reviewed changes

commit rustfmt stump in x t tidy even on check

90aec13

If checking succeeded, it's equivalent to successfully formatting.

WaffleLapkin force-pushed the tidypaper branch from f3e1948 to 90aec13 Compare April 15, 2025 19:52

bors added S-waiting-on-bors and removed S-waiting-on-review labels Apr 15, 2025

Zalathar mentioned this pull request Apr 16, 2025

Rollup of 8 pull requests #139888

Closed

Zalathar mentioned this pull request Apr 16, 2025

Rollup of 10 pull requests #139895

Closed

matthiaskrgr mentioned this pull request Apr 16, 2025

Rollup of 9 pull requests #139912

Merged

bors merged commit b65e6b7 into rust-lang:master Apr 16, 2025
6 checks passed

rustbot added this to the 1.88.0 milestone Apr 16, 2025

WaffleLapkin deleted the tidypaper branch April 17, 2025 13:05

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix some tidy paper cuts #139867

Fix some tidy paper cuts #139867

WaffleLapkin commented Apr 15, 2025

rustbot commented Apr 15, 2025

jieyouxu left a comment •

edited

Loading

jieyouxu commented Apr 15, 2025

Kobzol left a comment

Kobzol Apr 15, 2025

WaffleLapkin Apr 15, 2025

WaffleLapkin commented Apr 15, 2025

bors commented Apr 15, 2025

Kobzol commented Apr 17, 2025

WaffleLapkin commented Apr 17, 2025

Kobzol commented Apr 17, 2025

Fix some tidy paper cuts #139867

Fix some tidy paper cuts #139867

Conversation

WaffleLapkin commented Apr 15, 2025

rustbot commented Apr 15, 2025

jieyouxu left a comment • edited Loading

Choose a reason for hiding this comment

jieyouxu commented Apr 15, 2025

Kobzol left a comment

Choose a reason for hiding this comment

Kobzol Apr 15, 2025

Choose a reason for hiding this comment

WaffleLapkin Apr 15, 2025

Choose a reason for hiding this comment

WaffleLapkin commented Apr 15, 2025

bors commented Apr 15, 2025

Kobzol commented Apr 17, 2025

WaffleLapkin commented Apr 17, 2025

Kobzol commented Apr 17, 2025

jieyouxu left a comment •

edited

Loading