Merged
Conversation
Contributor
|
@fmease Thanks so much for putting this together! |
This comment has been minimized.
This comment has been minimized.
This comment was marked as resolved.
This comment was marked as resolved.
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). |
bjorn3
reviewed
Sep 5, 2025
bjorn3
reviewed
Sep 5, 2025
bc1642e to
33baaaf
Compare
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 |
Member
Author
I see, good to know for the future. I'll keep it as is now for simplicity. @bors r=Mark-Simulacrum |
Collaborator
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
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)
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.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Unblocks #146071, cc @npmccallum.
Steps to reproduce:
src/tools/bump-stage0'stomldependency from 0.7 to 0.9 to fix build error (see Zulip topic)./x run src/tools/bump-stage0rustfmt+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")