rustfmt subtree update by jieyouxu · Pull Request #161964 · rust-lang/rust

jieyouxu · 2026-08-29T07:45:16Z

Subtree-pull direction for rust-lang/rustfmt#7079.

As discussed in #t-rustfmt > need a sync ASAP @ 💬, we didn't bump version / do changelog between the subtree-push and this subtree-pull yet.

Last commit I had to regenerate the main workspace lockfile.

r? @ytmimi

When formatting a function with a single parameter with `fn_params_layout` set to `Vertical`, the previous tactic would remove any trailing commas before spilling to multiple lines for other reasons, such as long function names or return types. Instead, use the same tactic as `Tall` does, so that the trailing comma is kept if the end result spans multiple lines. `fn_params_layout = "Vertical"` is stable, so this is a breaking change. Guard on the style edition so that it only takes effect starting in the next edition. Issue rust-lang#6889 `fn_params_layout = "Vertical"` removes single argument's trailing comma

I can't markdown.

…subtree-update

Fix subtree sync doc commit message template markup

…om outer attributes It's possible that at least one of the attributes is a custom proc macro that takes the module tokens as an input. It's hard to know for sure since rustfmt only operates on the AST pre-expansion. In this case we'll be overly permissive and just ignore the file not found error so rustfmt can still try formatting the input. Fixes rustfmt issue 6959

@petrochenkov

…chenkov rustfmt fix: allow file not found errors for external mods annotated with `#[my_macro]` Tracking issue: rust-lang#54727 `#[my_macro]` was stabilized for macro hygiene 2.0 in rust-lang#157857. There isn't a guarantee that the external module exists on the file system so ignore any file not found errors encountered when trying to resolve the module's file. Fixes rust-lang/rustfmt#6959 r? @petrochenkov cc: @TimNN

@ytmimi

…es, r=ytmimi,jieyouxu rustfmt: Discover modules via `cfg_select!` This PR renames all occurrences of `cfg_match!` in rustfmt to `cfg_select!`. This makes the module file detection logic from rust-lang/rustfmt#6522 kick in for `cfg_select!` instead of `cfg_match!`, which no longer exists. This PR performs no other adjustments to the logic to be as small as possible. I am opening this PR in this repo since that is also the target for the more comprehensive rust-lang#154202, which covers more than merely detecting other files through `cfg_select!`. Closes rust-lang#158371. CC: @ytmimi, @CAD97

Fixes 5973 The [attribute] docs in the rust reference explain that inner attributes are allowed in block expressions. [attribute]: https://doc.rust-lang.org/reference/attributes.html

…oc-attributes-docs Fix normalize_doc_attributes configuration docs

We now have a much larger enterprise parallel job limit.

To make it easier to configure merge queue and reduce duplication.

…iling_comments_that_end_in_a_comma tests: cover trailing comments that end in a comma

…990) Co-authored-by: Yacin Tmimi <yacintmimi@gmail.com>

`cfg_select!` parsing needs to be implemented in rustfmt right now because there's no good way to call `rustc_attr_parsing::parse_cfg_select`.

The plan is to leverage `rewrite_match_body` to help with `cfg_select!` formatting.

Drop unused `Makefile.toml`

…subtree-update

rustbot · 2026-08-29T07:45:21Z

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.

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

cc @rust-lang/rustfmt

ytmimi · 2026-08-29T15:44:57Z

@bors r+ p=1 rollup=never

rust-bors · 2026-08-29T15:45:00Z

📌 Commit e3e8a34 has been approved by ytmimi

It is now in the queue for this repository.

rust-bors · 2026-08-29T21:09:30Z

☀️ Test successful - CI
Approved by: ytmimi
Duration: 3h 16m 22s
Pushing fd7ed57 to main...

github-actions · 2026-08-29T21:12:55Z

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 bdf8733 (parent) -> fd7ed57 (this PR)

Test differences

Show 10 test diffs

Stage 1

cargo_fmt_tests::targets::all_targets::cargo_fmt_strategy_root::assert_correct_targets_loaded_from_root: [missing] -> pass (J0)
rustfmt_nightly_usage_text: [missing] -> pass (J0)
rustfmt_usage_text: pass -> [missing] (J0)
test::emit_mode_from_inline_config_is_rejected: [missing] -> pass (J0)
test::warning_tests: [missing] -> pass (J0)

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

Job group index

J0: x86_64-gnu-tools, x86_64-msvc-ext3

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard fd7ed57dfd3bdebb745a1d8158638727b0e7047a --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

x86_64-gnu-gcc: 48m 7s -> 1h 10m (+46.7%)
x86_64-gnu-stdlib-semver-check: 18m 30s -> 10m 5s (-45.5%)
dist-x86_64-msvc-alt: 1h 52m -> 2h 41m (+43.6%)
x86_64-msvc-ext3: 1h 23m -> 1h 56m (+39.0%)
dist-i686-msvc: 2h 7m -> 1h 19m (-38.0%)
x86_64-gnu-gcc-core-tests: 17m 40s -> 11m 7s (-37.1%)
i686-gnu-1: 2h 4m -> 1h 24m (-32.7%)
dist-armv7-linux: 1h 12m -> 1h 34m (+29.7%)
pr-check-1: 38m 9s -> 26m 59s (-29.3%)
i686-gnu-nopt-2: 1h 49m -> 2h 20m (+27.9%)

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-08-29T21:53:20Z

Finished benchmarking commit (fd7ed57): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

Max RSS (memory usage)

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

Cycles

Results (secondary 0.5%)

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)	3.4%	[3.4%, 3.4%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.4%	[-2.4%, -2.4%]	1
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: 474.125s -> 476.157s (0.43%)
Artifact size: 402.92 MiB -> 402.84 MiB (-0.02%)

jasonaowen and others added 30 commits June 12, 2026 14:47

rustfmt: Discover modules via cfg_select!

385dbfe

Fix commit message template markup

c88bbc8

I can't markdown.

Merge commit 'd427a7c1adc8afd86a7ebf3daec769a434cb2307' into rustfmt-…

2aeef85

…subtree-update

Merge pull request rust-lang#6970 from jieyouxu/docs/subtree-sync

cd670ef

Fix subtree sync doc commit message template markup

unify the AST repr of type const and const RHS

a8307d5

tests: Implement snapshot test suites for formatting errors

cf7dafb

doc: Add instructions for updating snapshot tests

34ced3e

deps: Update annotate-snippets

aceacbf

Make FieldDef smaller

0c393d1

fix: preserve attributes for variadic fn parameters (6590)

76d2c6d

format type consts

e481edb

tests: cover trailing whitespace annotations on multibyte lines

cddcf1c

Fix normalize_doc_attributes configuration docs

502b4f3

Don't remove inner attributes from loop, for and while expressions

0675df6

Fixes 5973 The [attribute] docs in the rust reference explain that inner attributes are allowed in block expressions. [attribute]: https://doc.rust-lang.org/reference/attributes.html

Merge pull request rust-lang#6898 from WaterWhisperer/fix-normalize-d…

8cd45f4

…oc-attributes-docs Fix normalize_doc_attributes configuration docs

fix: prevent panic on inner attributes in a loop body inside a closure

7e56db3

Remove parallel limit on integration jobs

b48a709

We now have a much larger enterprise parallel job limit.

Merge Linux, Windows and Mac CI into one workflow

d9753b1

To make it easier to configure merge queue and reduce duplication.

Use merge queue

5a16631

tests: cover macro calls following one with invalid syntax

b1d0c14

tests: cover trailing comments that end in a comma

3d53170

Merge pull request rust-lang#6991 from shulaoda/07-28-tests_cover_tra…

8ddb21c

…iling_comments_that_end_in_a_comma tests: cover trailing comments that end in a comma

fix: prevent panic when whitespace separates macro_rules and ! (6…

53bf773

…990) Co-authored-by: Yacin Tmimi <yacintmimi@gmail.com>

feat: parse cfg_select! within rustfmt

9b49f71

`cfg_select!` parsing needs to be implemented in rustfmt right now because there's no good way to call `rustc_attr_parsing::parse_cfg_select`.

chore: make rewrite_match_body pub(crate) within rustfmt

f6deac5

The plan is to leverage `rewrite_match_body` to help with `cfg_select!` formatting.

feat: implement cfg_select! formatting in rustfmt

b764bd3

ytmimi and others added 3 commits August 28, 2026 13:28

Merge pull request rust-lang#7082 from jieyouxu/jieyouxu/unused-makefile

7af3320

Drop unused `Makefile.toml`

Merge commit '7af33204708cefcbd44eea5253f7d9a450f8d290' into rustfmt-…

d8b08e6

…subtree-update

[Deps] Regenerate lockfile

e3e8a34

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-rustfmt Relevant to the rustfmt team, which will review and decide on the PR/issue. labels Aug 29, 2026

rustbot assigned ytmimi Aug 29, 2026

This comment was marked as off-topic.

Sign in to view

jieyouxu added the subtree-sync PR updates a subtree (miri, clippy, etc). Ignored by no-merges check label Aug 29, 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 Aug 29, 2026

ytmimi mentioned this pull request Aug 29, 2026

[ICE]: long string literals cause SourceAnnotation range beyond buffer rust-lang/rustfmt#7084

Closed

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 Aug 29, 2026

rust-bors Bot merged commit fd7ed57 into rust-lang:main Aug 29, 2026
14 checks passed

rustbot added this to the 1.100.0 milestone Aug 29, 2026

jieyouxu deleted the rustfmt-subtree-update branch August 30, 2026 07:41

jieyouxu mentioned this pull request Sep 2, 2026

const statement body expr formatting changed (unexpectedly?) rust-lang/rustfmt#7092

Closed

sandhose mentioned this pull request Sep 2, 2026

Stop wrapping comments in rustfmt, drop redundant options element-hq/matrix-authentication-service#5956

Merged

ytmimi modified the milestones: 1.100.0, 1.98.0 Sep 10, 2026

ytmimi mentioned this pull request Sep 10, 2026

rustfmt feature: Sync r-l/r milestones to r-l/rustfmt when merging subtree sync PRs rust-lang/triagebot#2499

Open

Navigation Menu

Uh oh!

Uh oh!

rustfmt subtree update - #161964

rustfmt subtree update#161964
rust-bors[bot] merged 138 commits into
rust-lang:mainfrom
jieyouxu:rustfmt-subtree-update

jieyouxu commented Aug 29, 2026

Uh oh!

rustbot commented Aug 29, 2026

Uh oh!

This comment was marked as off-topic.

ytmimi commented Aug 29, 2026

Uh oh!

rust-bors Bot commented Aug 29, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented Aug 29, 2026

Uh oh!

Uh oh!

github-actions Bot commented Aug 29, 2026

Stage 1

Uh oh!

rust-timer commented Aug 29, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

Uh oh!

Uh oh!

Conversation

jieyouxu commented Aug 29, 2026

Uh oh!

rustbot commented Aug 29, 2026

Uh oh!

This comment was marked as off-topic.

ytmimi commented Aug 29, 2026

Uh oh!

rust-bors Bot commented Aug 29, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented Aug 29, 2026

Uh oh!

Uh oh!

github-actions Bot commented Aug 29, 2026

Test differences

Stage 1

Job duration changes

Uh oh!

rust-timer commented Aug 29, 2026

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants