[DO NOT MERGE] Test fix for subtree sync by jieyouxu · Pull Request #165409 · rust-lang/rust

jieyouxu · 2026-11-03T14:08:07Z

For #165378 to accomodate #162232 changes.

Only last commit is relevant, this PR has cherry-picked commits from #162232.

The main thing here is to be more explicit on assertions: e.g. to answer are we expecting something to be printed to stdout or stderr? I thought about rewriting the existing macro to handle this case too, but couldn't find a good approach for that, and decided that the plain code, while more lines, was more readable.

Firstly, Simplify the directory structure: we only need a single package here, so drag everything up for that. Secondly, make it more explicit exactly which config we expect to read by setting up configs with different options, rather than just ignoring all formatting. Also add tests for other existing behaviour: searching in `HOME` and `XDG_CONFIG_HOME` when no config is given nor found.

…est-updates Integration test updates

Fix `cfg_if!` error count leaks

So we can assert that `rustfmt` exits how we expect.

Allow `llm-assisted` label to be set by users without write access

I.e. do not try to use `{{ ... }}` concise double-block formatting if there are comments in-between the outer/inner braces.

…omments Don't lose comments and attributes between `cfg_select!` predicates, outer/inner blocks, arm body and trailing commas

Based on rustfmt issue 7215 it seems that we missed handling different kinds of string literals. Before trying to address that issue I thought it would be best if we refactored the match to be exhaustive.

…s after `=>`

…ontrol-brace-style Have `cfg_select!` double-brace concise formatting respect `control_brace_style`

Signed-off-by: hashcatHitman <155700084+hashcatHitman@users.noreply.github.com>

We used to need them for standalone binaries, but we no longer do. Remove the no longer used GHA workflow. Discussed in <https://rust-lang.zulipchat.com/#narrow/channel/357797-t-rustfmt/topic/What.20is.20upload-assets.20workflow.20supposed.20to.20do.3F/with/635506648>.

…d-assets Remove no longer used `upload-assets` GHA workflow

Rustc pull update 2026-11-02

Prepare for v1.12.0 release

jieyouxu · 2026-11-03T14:08:23Z

@bors try jobs=test-x86_64-gnu-tools

… r=<try> [DO NOT MERGE] Test fix for subtree sync try-job: test-x86_64-gnu-tools

This is failing when we combine: 1. Actually checking exit code for `dont_emit_ICE`, and 2. rust-lang#162232 removing `builtin_syntax` `builtin #` (all editions) in favor of keyword prefixes `k#` as part of `forced_keywords`. Cause is simple: 1. `dont_emit_ICE` checks exit code. 2. One of the listed tests, `tests/target/issue_6159.rs` was previously using `builtin #` syntax which is parsed on all editions, including default 2015 edition. 3. rust-lang#162232 switched that test over to use `k#` reserved keyword syntax which is only Edition 2021+. Note the UI test actually get `//@ rustfmt-edition: 2021`. 4. `dont_emit_ICE` as an integration test does not set `--edition` explicitly, so Edition 2015 is used. 5. Now `issue_6159.rs` will not ICE but will fail to parse since it's on Edition 2015 not Edition 2021+. To fix it, just run rustfmt with `--edition=2021` for `issue_6159.rs` in `dont_emit_ICE` as well. Relevant links: - `builtin_syntax`: <rust-lang#110694> - MCP for switching to Edition 2021+ `k#` reserved keyword prefixes: <rust-lang/compiler-team#945> - Tracking issue for `forced_keywords`: <rust-lang#153839> - Impl of `forced_keywords`: rust-lang#161775 - Impl of MCP that also modified rustfmt tests to use `forced_keywords`: <rust-lang#162232>.

rust-bors · 2026-11-03T15:22:10Z

☀️ Try build successful (CI)
Build commit: a2bc622 (a2bc622e7c525fd504f7c2f61ef4aac3b6f0e192)
Base parent: 6a98084 (6a98084e4a21b04504c034dfc640e35e32ab9854)

fmease · 2026-11-03T20:44:38Z

The relevant commit has now been cherry-picked into #162232.

matthewhughes934 and others added 30 commits October 21, 2026 19:41

Allow llm-assisted label to be set by users without write access

a50d9a9

Add test demonstrating current error leak formatting

fad0b13

Properly reset error count for cfg_if!

b1c0b19

Merge pull request rust-lang#7196 from matthewhughes934/integration-t…

44a8861

…est-updates Integration test updates

Merge pull request rust-lang#7195 from jieyouxu/jieyouxu/cfg-if

28968c5

Fix `cfg_if!` error count leaks

Integration tests: also capture exit code

ba09f12

So we can assert that `rustfmt` exits how we expect.

Merge pull request rust-lang#7207 from jieyouxu/jieyouxu/triagebot-label

0772c1d

Allow `llm-assisted` label to be set by users without write access

test: rename multi-file cfg_select! tests subfolder

4689345

test: group cfg_select! related tests under subfolder

49c47fc

test: add regression test for miri between-block comment

04d74ce

fix(cfg_select): don't use concise format when in-between comments exist

44541eb

I.e. do not try to use `{{ ... }}` concise double-block formatting if there are comments in-between the outer/inner braces.

fix(cfg_select): don't lose comments/attrs between => and arm expr

018f54c

fix(cfg_select): don't lose comments between predicate and =>

0aff56c

fix(cfg_select): don't lose comment between body and trailing comma

0dd546a

Merge pull request rust-lang#7211 from jieyouxu/jieyouxu/cfg-select-c…

9ab72ab

…omments Don't lose comments and attributes between `cfg_select!` predicates, outer/inner blocks, arm body and trailing commas

test(cfg_select): snapshot current control_brace_style behavior

a5198eb

refactor: exhaustively match on token::LitKind

19cdcb6

Based on rustfmt issue 7215 it seems that we missed handling different kinds of string literals. Before trying to address that issue I thought it would be best if we refactored the match to be exhaustive.

fix(cfg_select): respect control_brace_style config

e5ad9ad

test(cfg_select): add coverage for control_brace_style with comment…

3d87f59

…s after `=>`

test(cfg_select): add coverage for long comment before arrow

67bfa44

Merge pull request rust-lang#7214 from jieyouxu/jieyouxu/cfg-select-c…

fe7d957

…ontrol-brace-style Have `cfg_select!` double-brace concise formatting respect `control_brace_style`

ci: Disable credential persistence

ecc66a8

Signed-off-by: hashcatHitman <155700084+hashcatHitman@users.noreply.github.com>

ci: Expand github.event.inputs.commit_hash in env

a754ca9

Signed-off-by: hashcatHitman <155700084+hashcatHitman@users.noreply.github.com>

ci: Expand github.event.inputs.rustfmt_configs in env

2c9df22

Signed-off-by: hashcatHitman <155700084+hashcatHitman@users.noreply.github.com>

ci: Expand github.event.inputs.clone_url in env

ad47c3e

Signed-off-by: hashcatHitman <155700084+hashcatHitman@users.noreply.github.com>

ci: Expand github.event.inputs.branch_name in env

e2e3160

Signed-off-by: hashcatHitman <155700084+hashcatHitman@users.noreply.github.com>

ci: Expand github.event.inputs.language_edition in env

ce40bba

Signed-off-by: hashcatHitman <155700084+hashcatHitman@users.noreply.github.com>

ci: Expand github.event.inputs.style_edition in env

52d6915

Signed-off-by: hashcatHitman <155700084+hashcatHitman@users.noreply.github.com>

jieyouxu and others added 12 commits November 2, 2026 20:36

chore: bump rustfmt version to v1.12.0

f237e20

Merge pull request rust-lang#7229 from jieyouxu/jieyouxu/remove-uploa…

fb78ede

…d-assets Remove no longer used `upload-assets` GHA workflow

Merge pull request rust-lang#7226 from jieyouxu/subtree-pull-20261102

0f763a0

Rustc pull update 2026-11-02

Merge pull request rust-lang#7227 from jieyouxu/jieyouxu/release/1.12.0

fd17c29

Prepare for v1.12.0 release

chore: bump rustfmt version to v1.12.0 in the r-l/r workspace

bb2e461

Replace builtin # field_of with k#field_of

ebb4a8b

Replace builtin # deref with k#deref

c5bab76

Replace builtin # offset_of with k#offset_of

44d0732

Replace builtin # type_ascribe with k#type_ascribe

33bb9b0

Replace builtin # {,un}wrap_binder with k#{,un}wrap_binder

247b8c1

Rename feature builtin_syntax to internal_syntax

c9a2797

This comment has been minimized.

Sign in to view

rust-bors Bot pushed a commit that referenced this pull request Nov 3, 2026

Auto merge of #165409 - jieyouxu:jieyouxu/exp/rustfmt-builtin-syntax,…

a2bc622

… r=<try> [DO NOT MERGE] Test fix for subtree sync try-job: test-x86_64-gnu-tools

jieyouxu mentioned this pull request Nov 3, 2026

Replace builtin # with k# #162232

Merged

jieyouxu force-pushed the jieyouxu/exp/rustfmt-builtin-syntax branch from 5676e60 to 6da7b55 Compare November 3, 2026 14:34

jieyouxu closed this Nov 4, 2026

rustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Nov 4, 2026

jieyouxu deleted the jieyouxu/exp/rustfmt-builtin-syntax branch November 4, 2026 00:18

Navigation Menu

Repository navigation

[DO NOT MERGE] Test fix for subtree sync - #165409

[DO NOT MERGE] Test fix for subtree sync#165409
jieyouxu wants to merge 66 commits into
rust-lang:mainfrom
jieyouxu:jieyouxu/exp/rustfmt-builtin-syntax

jieyouxu commented Nov 3, 2026 •

edited by rustbot

Loading

Uh oh!

jieyouxu commented Nov 3, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented Nov 3, 2026

Uh oh!

fmease commented Nov 3, 2026

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Conversation

jieyouxu commented Nov 3, 2026 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jieyouxu commented Nov 3, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented Nov 3, 2026

Uh oh!

fmease commented Nov 3, 2026

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

jieyouxu commented Nov 3, 2026 •

edited by rustbot

Loading