Repository navigation
Josh subtree pull nightly 2026-10-19 - #7200
Merged
jieyouxu merged 3 commits intoOct 20, 2026
Merged
Conversation
…, r=jieyouxu rustfmt subtree update 2026-10-05 Subtree update of `rustfmt` to rust-lang@4368801 Created using https://github.com/rust-lang/josh-sync. I wanted to get a little hands on experience with the new josh sync tooling. Overall it's so much nicer to use than the older patched git subtree setup we were using! A fairly small sync, with one fix to `wrap_comments` from rust-lang#7156. r? @jieyouxu
This updates the rust-toolchain.toml file to nightly-2026-10-19 (b6eeb93c992027a03e1fd120b6652546396b142c).
Pull recent changes from https://github.com/rust-lang/rust via Josh. Previous upstream ref: rust-lang/rust@2822155 New upstream ref: rust-lang/rust@b6eeb93 Filtered ref: rust-lang/rustfmt@fab8d10 Upstream diff: rust-lang/rust@2822155...b6eeb93 This merge was created using https://github.com/rust-lang/josh-sync.
rustbot
added
the
S-waiting-on-review
jieyouxu
added
the
A-subtree-syncs
rustbot
added
release-notes
Member
|
NB: we will ask infra-admins to force-push away this PR's commits (context: #t-rustfmt > subtree sync ops @ 💬). (In case "what happened to commits on this merged PR".) |
Contributor
Author
|
Thank you! Yes, reverting these commits so that we can move forward with the sync is ideal 🙏🏼 |
Contributor
Author
|
Looks like we're taking a different approach and trying to merge rust-lang/rust#164646 so that we can retry the josh-subtree pull with rustfmt changes from the r-l/r side. |
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
4 participants
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.
I used
rustc-josh-sync pullto create the changes in this PRBefore (nightly-2026-10-05):
After (nightly-2026-10-19):