rustfmt subtree update 2026-10-05 by ytmimi · Pull Request #163831 · rust-lang/rust

ytmimi · 2026-10-05T17:41:52Z

Subtree update of rustfmt to rust-lang/rustfmt@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/rustfmt#7156.

r? @jieyouxu

This reverts commit b4260f44f5d8cd538718b9046eb51baaa1eb8f5e, reversing changes made to ec46636574fca6fce6014a143392f7d4a6d4d2ee. Since we can't actually do backports from rustfmt repo itself...

Revert "Route rustfmt repo backport nominations to zulip"

When formatting an item with a where clause, the budget before the where clause is throttled by the item header width. However, comments between the `where` keyword and the first predicate are indented on their own lines and should be formatted with the full clause budget (`clause_shape`) rather than the throttled budget. Pass `clause_shape` to `rewrite_comments_before_after_where` so that comments after `where` are not prematurely wrapped. Fixes rust-lang/rustfmt#7148.

…comment-wrap fix(items): format comments after where using clause_shape budget

Routine CI maintenance

This updates the rust-toolchain.toml file to nightly-2026-10-05 (2822155).

Pull recent changes from https://github.com/rust-lang/rust via Josh. Previous upstream ref: rust-lang/rust@6bb1652 New upstream ref: rust-lang/rust@2822155 Filtered ref: rust-lang/rustfmt@f77686b Upstream diff: rust-lang/rust@6bb1652...2822155 This merge was created using https://github.com/rust-lang/josh-sync.

Josh subtree pull nightly-2026-10-05

rustbot · 2026-10-05T17:41:55Z

rustfmt is developed in its own repository. If possible, consider making this change to rust-lang/rustfmt instead.

cc @rust-lang/rustfmt

rustbot · 2026-10-05T17:41:59Z

⚠️ Warning ⚠️

There are issue links (such as #123) in the commit messages of the following commits.
Please move them to the PR description, to avoid spamming the issues with references to the commit, and so this bot can automatically canonicalize them to avoid issues with subtrees.
- e8aa31c

jieyouxu

Thanks
@bors r+ rollup=never

View changes since this review

rust-bors · 2026-10-06T07:09:40Z

📌 Commit bfe6e86 has been approved by jieyouxu

It is now in the queue for this repository.

@jieyouxu

…, r=jieyouxu rustfmt subtree update 2026-10-05 Subtree update of `rustfmt` to rust-lang/rustfmt@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/rustfmt#7156. r? @jieyouxu

JonathanBrouwer · 2026-10-06T12:22:02Z

@bors cancel
@bors p=6
7 jobs are "waiting for bors approval" so this is not going to finish, let's retry

rust-bors · 2026-10-06T12:22:06Z

Auto build was cancelled. Cancelled workflows:

https://github.com/rust-lang/rust/actions/runs/37440800422

The next pull request likely to be tested is #163876.

@jieyouxu

…, r=jieyouxu rustfmt subtree update 2026-10-05 Subtree update of `rustfmt` to rust-lang/rustfmt@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/rustfmt#7156. r? @jieyouxu

rust-log-analyzer · 2026-10-06T13:23:31Z

The job dist-armv7-linux failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)

   Compiling dirs v6.0.0
[RUSTC-TIMING] dirs test:false 0.110
   Compiling gen-lsp-types v0.11.0

Session terminated, killing shell...::group::Clock drift check
  local time: Tue Oct  6 13:23:15 UTC 2026
##[error]The runner has received a shutdown signal. This can happen when the runner service is stopped, or a manually started runner is canceled.
  network time: Tue, 06 Oct 2026 13:23:16 GMT
##[endgroup]
 ...killed.

rust-bors · 2026-10-06T13:24:11Z

💔 Test for fbc187d failed: CI. Failed job:

auto - dist-armv7-linux (web logs, enhanced plaintext logs)

JonathanBrouwer · 2026-10-06T13:31:55Z

@bors retry

@jieyouxu

…, r=jieyouxu rustfmt subtree update 2026-10-05 Subtree update of `rustfmt` to rust-lang/rustfmt@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/rustfmt#7156. r? @jieyouxu

JonathanBrouwer · 2026-10-06T15:20:51Z

@bors cancel
It's doing the thing again...

rust-bors · 2026-10-06T15:20:55Z

Auto build was cancelled. Cancelled workflows:

https://github.com/rust-lang/rust/actions/runs/37484029811

The next pull request likely to be tested is #163831.

rust-bors · 2026-10-06T18:15:30Z

☀️ Test successful - CI
Approved by: jieyouxu
Duration: 2h 54m 15s
Pushing 8d1a764 to main...

github-actions · 2026-10-06T18:18:32Z

What is this?

This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing b57eb9a (parent) -> 8d1a764 (this PR)

Test differences

Show 2 test diffs

2 doctest diffs were found. These are ignored, as they are noisy.

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 8d1a76430406c877b35d0b627e7f796dcf0dfeca --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

dist-i686-mingw: 34m 48s -> 54m 18s (+56.0%)
dist-riscv64-linux-gnu: 1h 3m -> 1h 34m (+48.1%)
test-x86_64-gnu-miri: 53m 49s -> 1h 17m (+44.8%)
test-x86_64-gnu-gcc-core-tests: 18m 24s -> 11m 28s (-37.7%)
test-x86_64-gnu-stdlib-semver-check: 17m 23s -> 10m 52s (-37.5%)
dist-loongarch64-musl: 2h 5m -> 1h 19m (-37.1%)
test-x86_64-gnu-stable: 2h 35m -> 1h 38m (-36.7%)
dist-riscv64-linux-musl: 1h 37m -> 1h 2m (-35.7%)
test-x86_64-gnu-llvm-22: 39m 14s -> 53m (+35.1%)
test-arm-android: 1h 14m -> 1h 40m (+34.7%)

How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

rust-timer · 2026-10-06T18:59:45Z

Finished benchmarking commit (8d1a764): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	0.3%	[0.3%, 0.3%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results (secondary -0.9%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	2.6%	[2.5%, 2.7%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.2%	[-3.9%, -2.8%]	3
All ❌✅ (primary)	-	-	0

Cycles

Results (primary 0.0%, secondary -5.8%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

	mean	range	count
Regressions ❌ (primary)	2.1%	[2.1%, 2.1%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-2.1%	[-2.1%, -2.1%]	1
Improvements ✅ (secondary)	-5.8%	[-14.1%, -1.8%]	9
All ❌✅ (primary)	0.0%	[-2.1%, 2.1%]	2

Binary size

This perf run didn't have relevant results for this metric.

Bootstrap: 489.693s -> 489.893s (0.04%)
Artifact size: 409.33 MiB -> 408.60 MiB (-0.18%)

Newer issue and pull request comments have database IDs beyond GraphQL's Int (rust-lang/rust#163831's are near 6 billion), which GitHub's databaseId returns anyway; decoding them as i32 failed the whole conversation's refresh. Comments now read fullDatabaseId, a BigInt GitHub sends as a string. Found in the hand check.

jieyouxu and others added 9 commits September 30, 2026 23:20

Revert "Route rustfmt repo backport nominations to zulip"

54bb490

This reverts commit b4260f44f5d8cd538718b9046eb51baaa1eb8f5e, reversing changes made to ec46636574fca6fce6014a143392f7d4a6d4d2ee. Since we can't actually do backports from rustfmt repo itself...

Merge pull request rust-lang#7154 from jieyouxu/revert-rustfmt-nom

5b554fc

Revert "Route rustfmt repo backport nominations to zulip"

Merge pull request rust-lang#7156 from dbaileychess/fix-where-clause-…

d4c75a3

…comment-wrap fix(items): format comments after where using clause_shape budget

ci: bump actions/checkout to v7.0.1

ca52f52

Merge pull request rust-lang#7160 from jieyouxu/ci-maintenance

e059862

Routine CI maintenance

Prepare for merging from rust-lang/rust

2bc67f4

This updates the rust-toolchain.toml file to nightly-2026-10-05 (2822155).

Merge pull request rust-lang#7162 from ytmimi/nightly-2026-10-05

bfe6e86

Josh subtree pull nightly-2026-10-05

ytmimi added subtree-sync PR updates a subtree (miri, clippy, etc). Ignored by no-merges check T-rustfmt Relevant to the rustfmt team, which will review and decide on the PR/issue. labels Oct 5, 2026

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 5, 2026

rustbot assigned jieyouxu Oct 5, 2026

jieyouxu approved these changes Oct 6, 2026

View reviewed changes

rust-bors Bot 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 Oct 6, 2026

jieyouxu changed the title ~~Josh subtree update nightly 2026 10 05~~ rustfmt subtree update Oct 6, 2026

jieyouxu changed the title ~~rustfmt subtree update~~ rustfmt subtree update 2026-10-05 Oct 6, 2026

rust-bors Bot mentioned this pull request Oct 6, 2026

perf:cache FFI safety results in improper_ctypes lint #163348

Merged

This comment has been minimized.

Sign in to view

rust-bors Bot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 6, 2026

rust-bors Bot removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 6, 2026

rust-bors Bot 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 Oct 6, 2026

This comment has been minimized.

Sign in to view

rust-bors Bot added merged-by-bors This PR was explicitly merged by bors. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 6, 2026

rust-bors Bot merged commit 8d1a764 into rust-lang:main Oct 6, 2026
15 checks passed

rustbot added this to the 1.101.0 milestone Oct 6, 2026

ytmimi deleted the josh-subtree-update-nightly-2026-10-05 branch October 6, 2026 19:21

ytmimi mentioned this pull request Oct 6, 2026

Josh Subtree Milestone Review rust-lang/triagebot#2521

Open

gold-silver-copper mentioned this pull request Oct 7, 2026

Every GitHub link opens in ghtui, or says why not gold-silver-copper/ghtui#6

Merged

Conversation

ytmimi commented Oct 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Oct 5, 2026

Uh oh!

rustbot commented Oct 5, 2026

Uh oh!

jieyouxu left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rust-bors Bot commented Oct 6, 2026

Uh oh!

This comment has been minimized.

JonathanBrouwer commented Oct 6, 2026

Uh oh!

rust-bors Bot commented Oct 6, 2026

Uh oh!

This comment has been minimized.

rust-log-analyzer commented Oct 6, 2026

Uh oh!

rust-bors Bot commented Oct 6, 2026

Uh oh!

JonathanBrouwer commented Oct 6, 2026

Uh oh!

This comment has been minimized.

JonathanBrouwer commented Oct 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rust-bors Bot commented Oct 6, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented Oct 6, 2026

Uh oh!

Uh oh!

github-actions Bot commented Oct 6, 2026

Test differences

Job duration changes

Uh oh!

rust-timer commented Oct 6, 2026

Overall result: ❌ regressions - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

ytmimi commented Oct 5, 2026 •

edited

Loading

jieyouxu left a comment •

edited by rustbot

Loading

JonathanBrouwer commented Oct 6, 2026 •

edited

Loading