Skip to content

Conversation

fmease
Copy link
Member

@fmease fmease commented Sep 5, 2025

Unblocks #146071, cc @npmccallum.

Steps to reproduce:

  1. Temporarily upgrade src/tools/bump-stage0's toml dependency from 0.7 to 0.9 to fix build error (see Zulip topic)
  2. Execute ./x run src/tools/bump-stage0
  3. Manually revert changes unrelated to nightly rustfmt+rustc (the latter needs to be bumped, too, for the driver (via))

r? @Mark-Simulacrum as discussed in #t-release > Bump stage0 rustfmt separately ("one-off")

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-release Relevant to the release subteam, which will review and decide on the PR/issue. labels Sep 5, 2025
@npmccallum
Copy link
Contributor

@fmease Thanks so much for putting this together!

@rust-log-analyzer

This comment has been minimized.

@fmease

This comment was marked as resolved.

@npmccallum
Copy link
Contributor

@fmease If, for whatever reason, you need to pick a different date than the 2025-09-05, the first date with the fix is 2025-09-03 (I tested it).

@fmease fmease force-pushed the bump-stage0-rustfmt branch from bc1642e to 33baaaf Compare September 5, 2025 18:20
@Mark-Simulacrum
Copy link
Member

FWIW, I don't think we need to revert the other changes - bumping stage0 beta is fine too.

r=me if CI is happy

@fmease
Copy link
Member Author

fmease commented Sep 5, 2025

FWIW, I don't think we need to revert the other changes - bumping stage0 beta is fine too.

I see, good to know for the future. I'll keep it as is now for simplicity.

@bors r=Mark-Simulacrum

@bors
Copy link
Collaborator

bors commented Sep 5, 2025

📌 Commit 33baaaf has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@bors 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 Sep 5, 2025
bors added a commit that referenced this pull request Sep 5, 2025
Rollup of 11 pull requests

Successful merges:

 - #138944 (Add `__isPlatformVersionAtLeast` and `__isOSVersionAtLeast` symbols)
 - #139113 (unstable book: in a sanitizer example, check the code)
 - #145735 (style-guide: Document absence of trailing whitespace)
 - #146041 (tidy: --bless now makes escheck run with --fix)
 - #146144 (compiler: Apply target features to the entry function)
 - #146225 (Simplify `{f16, f32, f64, f128}::midpoint()`)
 - #146234 (change file-is-generated doc comment to inner)
 - #146241 (rustc_infer: change top-level doc comment to inner)
 - #146242 (Ensure that `--html-after-content` option is used to check `scrape_examples_ice` rustdoc GUI test)
 - #146243 (remove couple of redundant clones)
 - #146250 (Bump stage0 rustfmt)

Failed merges:

 - #146200 (Simplify rustdoc-gui tester by calling directly browser-ui-test)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 55a62d5 into rust-lang:master Sep 5, 2025
10 checks passed
rust-timer added a commit that referenced this pull request Sep 5, 2025
Rollup merge of #146250 - fmease:bump-stage0-rustfmt, r=Mark-Simulacrum

Bump stage0 rustfmt

Unblocks #146071, cc `@npmccallum.`

Steps to reproduce:

1. Temporarily upgrade `src/tools/bump-stage0`'s `toml` dependency from 0.7 to 0.9 to fix build error (see Zulip topic)
2. Execute `./x run src/tools/bump-stage0`
3. Manually revert changes unrelated to nightly `rustfmt`+`rustc` (the latter needs to be bumped, too, for the driver ([via](#146250 (comment))))

r? `@Mark-Simulacrum` as discussed in [#t-release > Bump stage0 rustfmt separately ("one-off")](https://rust-lang.zulipchat.com/#narrow/channel/241545-t-release/topic/Bump.20stage0.20rustfmt.20separately.20.28.22one-off.22.29/with/537916615)
@rustbot rustbot added this to the 1.91.0 milestone Sep 5, 2025
@fmease fmease deleted the bump-stage0-rustfmt branch September 6, 2025 00:06
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Sep 6, 2025
Fix `bump-stage0` build failure, and check-build `bump-stage0` in CI

This PR bumps the `toml` dependency of the `bump-stage0` tool to `0.8.23`, which AFAICT is the highest `toml` version that's present in the r-l/r workspace's `Cargo.lock` already (so we don't introduce _another_ `toml 0.x.*` series). I added some byte-buffer-to-string intermediary to workaround `toml 0.8.*` not having the `toml 0.9.*` `toml::from_slice` API.

To catch obvious build failures of the `src/tools/bump-stage0` tool early, before we find out it can't even build when we really need it to work.

Contexts:

- rust-lang#146250 (comment)
- [#t-release > Bump stage0 rustfmt separately ("one-off") @ 💬](https://rust-lang.zulipchat.com/#narrow/channel/241545-t-release/topic/Bump.20stage0.20rustfmt.20separately.20.28.22one-off.22.29/near/537916615)

Fixes rust-lang#146252.
rust-timer added a commit that referenced this pull request Sep 6, 2025
Rollup merge of #146263 - jieyouxu:check-bump-stage0, r=Kobzol

Fix `bump-stage0` build failure, and check-build `bump-stage0` in CI

This PR bumps the `toml` dependency of the `bump-stage0` tool to `0.8.23`, which AFAICT is the highest `toml` version that's present in the r-l/r workspace's `Cargo.lock` already (so we don't introduce _another_ `toml 0.x.*` series). I added some byte-buffer-to-string intermediary to workaround `toml 0.8.*` not having the `toml 0.9.*` `toml::from_slice` API.

To catch obvious build failures of the `src/tools/bump-stage0` tool early, before we find out it can't even build when we really need it to work.

Contexts:

- #146250 (comment)
- [#t-release > Bump stage0 rustfmt separately ("one-off") @ 💬](https://rust-lang.zulipchat.com/#narrow/channel/241545-t-release/topic/Bump.20stage0.20rustfmt.20separately.20.28.22one-off.22.29/near/537916615)

Fixes #146252.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-release Relevant to the release subteam, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants