Assorted `run-make-support` maintenance #143683

jieyouxu · 2025-07-09T12:39:18Z

This PR should contain no functional changes.

Commit 1: Removes the support library's CHANGELOG. In the very beginning, I thought maybe we would try to version this library. But this is a purely internal test support library, and it's just extra busywork trying to maintain changelog/versions. It's also hopelessly outdated.
Commit 2: Resets version number to 0.0.0. Ditto on busywork.
Commit 3: Bump run-make-support to Edition 2024. The support library was already "compliant" with Edition 2024.
Commit 4: Slightly organizes the support library dependencies.
Commit 5: Previously, I tried hopelessly to maintain some manual formatting, but that was annoying because it required skipping rustfmt (so export ordering etc. could not be extra formatted). Give up, and do some rearrangements / module prefix tricks to get the lib.rs looking at least reasonable. IMO this is not a strict improvement, but I rather regain the ability to auto-format it with rustfmt.
Commit {6,7}: Noticed in Make sure fmt-write-bloat doesn't vacuously pass on no symbols #143669 that we apparently had both {is_msvc, is_windows_msvc}. This PR removes is_msvc in favor of is_windows_msvc to make it unambiguous (and only retain one way of gating) as there are some UEFI targets which are MSVC but not Windows.

Best reviewed commit-by-commit.

r? @Kobzol

Hopelessly outdated, and this support library is purely internal.

Purely internal test support library.

Even if the formatting isn't strictly "better", it at least allows rustfmtting it automatically.

rustbot · 2025-07-09T12:39:26Z

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

Kobzol · 2025-07-09T12:45:51Z

👍 on removing the changelog, I also thought several times that it's futile to try to do this. Also looks like all targets containing msvc currently end with windows-msvc, so it shouldn't be a behavior change.

You can r=me after CI is green.

jieyouxu · 2025-07-09T12:46:54Z

Also looks like all targets containing msvc currently end with windows-msvc, so it shouldn't be a behavior change.

I would be very concerned if we had non-Windows targets that ended with msvc 😆 (technically it should be more like .ends_with("-msvc") but yeah).

petrochenkov · 2025-07-09T13:19:07Z

UEFI targets are MSVC, but not windows (in terms of rustc_target, not sure how this maps on compiletest checks).

jieyouxu · 2025-07-09T13:49:51Z

Okay, in that case I'll go the inverse direction, and change this to is_windows_msvc to be unambiguous.

And not both `is_windows_msvc` and `is_msvc`.

jieyouxu · 2025-07-10T06:01:00Z

Changes since last reviewed:

Removed is_msvc in favor of the more clear is_windows_msvc.
Changed run-make tests to use is_windows_msvc only.

jieyouxu · 2025-07-10T06:01:40Z

@rustbot review

Kobzol · 2025-07-09T12:44:21Z

src/tools/run-make-support/src/lib.rs

@@ -3,9 +3,6 @@
 //! notably is built via cargo: this means that if your test wants some non-trivial utility, such
 //! as `object` or `wasmparser`, they can be re-exported and be made available through this library.

-// We want to control use declaration ordering and spacing (and preserve use group comments), so
-// skip rustfmt on this file.
-#![cfg_attr(rustfmt, rustfmt::skip)]
 #![warn(unreachable_pub)]


Would be nice to have the option to configure rustfmt through some magic comment directly in the file :)

The underlying reason for this particular skip is that rustfmt doesn't really tie comments to use statements, so they get moved all over the place.

Ignoring a whole file to rustfmt seems usually undesirable, so I think it's fine we don't have such magic comment.

I.e. rust-lang/rustfmt#3720

I meant more like a comment that changes e.g. the use grouping method only for a given file.

Kobzol · 2025-07-10T06:13:52Z

You can r=me once CI is green.

jieyouxu · 2025-07-10T07:18:58Z

PR CI is 🟢
@bors r=Kobzol rollup

bors · 2025-07-10T07:19:04Z

📌 Commit 3f4f23a has been approved by Kobzol

It is now in the queue for this repository.

Rollup of 12 pull requests Successful merges: - #136906 (Add checking for unnecessary delims in closure body) - #143652 (docs: document trait upcasting rules in `Unsize` trait) - #143657 (Resolver: refact macro map into external and local maps) - #143659 (Use "Innermost" & "Outermost" terminology for `AttributeOrder`) - #143663 (fix: correct typo in attr_parsing_previously_accepted message key) - #143666 (Re-expose nested bodies in rustc_borrowck::consumers) - #143668 (Fix VxWorks build errors) - #143670 (Add a new maintainer to the wasm32-wasip1 target) - #143675 (improve lint doc text) - #143683 (Assorted `run-make-support` maintenance) - #143695 (Auto-add `S-waiting-on-author` when the PR is/switches to draft state) - #143706 (triagebot.toml: ping lolbinarycat if tidy extra checks were modified) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #143683 - jieyouxu:rms-cleanup, r=Kobzol Assorted `run-make-support` maintenance This PR should contain no functional changes. - Commit 1: Removes the support library's CHANGELOG. In the very beginning, I thought maybe we would try to version this library. But this is a purely internal test support library, and it's just extra busywork trying to maintain changelog/versions. It's also hopelessly outdated. - Commit 2: Resets version number to `0.0.0`. Ditto on busywork. - Commit 3: Bump `run-make-support` to Edition 2024. The support library was already "compliant" with Edition 2024. - Commit 4: Slightly organizes the support library dependencies. - Commit 5: Previously, I tried hopelessly to maintain some manual formatting, but that was annoying because it required skipping rustfmt (so export ordering etc. could not be extra formatted). Give up, and do some rearrangements / module prefix tricks to get the `lib.rs` looking at least *reasonable*. IMO this is not a strict improvement, but I rather regain the ability to auto-format it with rustfmt. - Commit {6,7}: Noticed in #143669 that we apparently had *both* {`is_msvc`, `is_windows_msvc`}. This PR removes `is_msvc` in favor of `is_windows_msvc` to make it unambiguous (and only retain one way of gating) as there are some UEFI targets which are MSVC but not Windows. Best reviewed commit-by-commit. r? `@Kobzol`

jieyouxu added 5 commits July 9, 2025 20:02

Remove run-make-support CHANGELOG

8d58d5e

Hopelessly outdated, and this support library is purely internal.

Don't attempt to version run-make-support

ed520af

Purely internal test support library.

Bump run-make-support to Edition 2024

e70493d

Sort and document run-make-support dependencies

fae1546

Massage lib.rs so it can be rustfmt'd

200f132

Even if the formatting isn't strictly "better", it at least allows rustfmtting it automatically.

rustbot assigned Kobzol Jul 9, 2025

rustbot added A-run-make Area: port run-make Makefiles to rmake.rs S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jul 9, 2025

jieyouxu added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 9, 2025

jieyouxu added 2 commits July 10, 2025 13:54

Only provide is_windows_msvc to gate on windows-msvc

87a4121

And not both `is_windows_msvc` and `is_msvc`.

Use is_windows_msvc instead of is_msvc in run-make tests

3f4f23a

jieyouxu force-pushed the rms-cleanup branch from afd7e63 to 3f4f23a Compare July 10, 2025 05:58

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 10, 2025

Kobzol reviewed Jul 10, 2025

View reviewed changes

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 10, 2025

matthiaskrgr mentioned this pull request Jul 10, 2025

Rollup of 12 pull requests #143731

Merged

bors merged commit b5b35f1 into rust-lang:master Jul 10, 2025
11 checks passed

rustbot added this to the 1.90.0 milestone Jul 10, 2025

jieyouxu deleted the rms-cleanup branch July 10, 2025 17:04

Assorted run-make-support maintenance #143683

Assorted run-make-support maintenance #143683

Uh oh!

Conversation

jieyouxu commented Jul 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Jul 9, 2025

Uh oh!

Kobzol commented Jul 9, 2025

Uh oh!

jieyouxu commented Jul 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

petrochenkov commented Jul 9, 2025

Uh oh!

jieyouxu commented Jul 9, 2025

Uh oh!

jieyouxu commented Jul 10, 2025

Uh oh!

jieyouxu commented Jul 10, 2025

Uh oh!

Kobzol Jul 9, 2025

Choose a reason for hiding this comment

Uh oh!

jieyouxu Jul 10, 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!

jieyouxu Jul 10, 2025

Choose a reason for hiding this comment

Uh oh!

Kobzol Jul 10, 2025

Choose a reason for hiding this comment

Uh oh!

jieyouxu Jul 10, 2025

Choose a reason for hiding this comment

Uh oh!

Kobzol commented Jul 10, 2025

Uh oh!

jieyouxu commented Jul 10, 2025

Uh oh!

bors commented Jul 10, 2025

Uh oh!

Uh oh!

Uh oh!

Assorted `run-make-support` maintenance #143683

Assorted `run-make-support` maintenance #143683

jieyouxu commented Jul 9, 2025 •

edited

Loading

jieyouxu commented Jul 9, 2025 •

edited

Loading

jieyouxu Jul 10, 2025 •

edited

Loading