Rollup of 15 pull requests by JonathanBrouwer · Pull Request #165393 · rust-lang/rust

JonathanBrouwer · 2026-11-03T09:58:50Z

Successful merges:

rustfmt subtree update (v1.12.0) #165378 (rustfmt subtree update (v1.12.0))
Make inline attributes apply to the generated poll in async fn #149245 (Make inline attributes apply to the generated poll in async fn)
[perf] Reuse CanonicalVarKinds if no new variables were added #164304 ([perf] Reuse CanonicalVarKinds if no new variables were added)
Avoid building a region map when erasing bound regions #165109 (Avoid building a region map when erasing bound regions)
std: Use getexecpath() for current_exe() on OpenBSD #163393 (std: Use getexecpath() for current_exe() on OpenBSD)
offload: pass the linked device image to the host pass #164896 (offload: pass the linked device image to the host pass)
Reenable some cg_gcc tests that were disabled #165358 (Reenable some cg_gcc tests that were disabled)
Don't use llvm_type as the type of statics. #165371 (Don't use llvm_type as the type of statics.)
Replace builtin # with k# #162232 (Replace builtin # with k#)
Avoid oscillating line wrapping due to symbol indices #162608 (Avoid oscillating line wrapping due to symbol indices)
Use MalformedLintAttributeInput in more places #165029 (Use MalformedLintAttributeInput in more places)
AIX: Implement TLS destructor guard in std and update dynamic-loading-cdylib test #165203 (AIX: Implement TLS destructor guard in std and update dynamic-loading-cdylib test)
Fix rigidity assertion ICE #165230 (Fix rigidity assertion ICE)
Remove AbiAlign #165354 (Remove AbiAlign)
Refactorings in preparation for the move trait #165374 (Refactorings in preparation for the move trait)

OpenBSD added getexecpath(3) to libc, which returns an already-canonicalized executable path directly. Replace the sysctl(KERN_PROC_ARGV)-based implementation. This was the last user of div_exact in std, so drop the exact_div feature gate.

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>

JonathanBrouwer · 2026-11-03T09:58:59Z

@bors r+ p=5 force

rust-bors · 2026-11-03T10:00:22Z

📌 Commit b93b493 has been approved by JonathanBrouwer

It is now in the queue for this repository.

…uwer Rollup of 15 pull requests Successful merges: - #165378 (rustfmt subtree update (v1.12.0)) - #149245 (Make inline attributes apply to the generated `poll` in async fn) - #164304 ([perf] Reuse CanonicalVarKinds if no new variables were added) - #165109 (Avoid building a region map when erasing bound regions) - #163393 (std: Use getexecpath() for current_exe() on OpenBSD) - #164896 (offload: pass the linked device image to the host pass) - #165358 (Reenable some cg_gcc tests that were disabled) - #165371 (Don't use `llvm_type` as the type of `static`s.) - #162232 (Replace `builtin #` with `k#`) - #162608 (Avoid oscillating line wrapping due to symbol indices) - #165029 (Use `MalformedLintAttributeInput` in more places) - #165203 (AIX: Implement TLS destructor guard in std and update dynamic-loading-cdylib test) - #165230 (Fix rigidity assertion ICE) - #165354 (Remove `AbiAlign`) - #165374 (Refactorings in preparation for the move trait)

rust-bors · 2026-11-03T10:10:32Z

💔 Test for d2ff96f failed: CI. Failed job:

auto - test-pr-check-2 (web logs, enhanced plaintext logs)

rust-bors · 2026-11-03T10:12:54Z

PR #165354, which is a member of this rollup, was unapproved.

rust-log-analyzer · 2026-11-03T10:41:00Z

The job test-pr-check-2 failed! Check out the build log: (web) (plain enhanced) (plain)

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

[RUSTC-TIMING] ui_test test:false 0.678
error[E0609]: no field `abi` on type `rustc_abi::Align`
   --> src/tools/miri/src/shims/unix/macos/sync.rs:571:45
    |
571 |             Some((layout.size, layout.align.abi)),
    |                                             ^^^ unknown field

For more information about this error, try `rustc --explain E0609`.
[RUSTC-TIMING] miri test:false 5.044
error: could not compile `miri` (lib) due to 1 previous error

rust-log-analyzer · 2026-11-03T10:42:01Z

The job test-pr-check-2 failed! Check out the build log: (web) (plain enhanced) (plain)

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

[RUSTC-TIMING] ui_test test:false 0.709
error[E0609]: no field `abi` on type `rustc_abi::Align`
   --> src/tools/miri/src/shims/unix/macos/sync.rs:571:45
    |
571 |             Some((layout.size, layout.align.abi)),
    |                                             ^^^ unknown field

For more information about this error, try `rustc --explain E0609`.
[RUSTC-TIMING] miri test:false 5.523
error: could not compile `miri` (lib) due to 1 previous error

brad0 and others added 30 commits October 19, 2026 03:20

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>

rustbot added A-CI Area: Our Github Actions CI A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-run-make Area: port run-make Makefiles to rmake.rs labels Nov 3, 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 Nov 3, 2026

rust-bors Bot mentioned this pull request Nov 3, 2026

rustfmt subtree update (v1.12.0) #165378

Merged

This comment has been minimized.

Sign in to view

rust-bors Bot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 3, 2026

JonathanBrouwer mentioned this pull request Nov 3, 2026

Remove AbiAlign #165354

Merged

rust-bors Bot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 3, 2026

JonathanBrouwer closed this Nov 3, 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 3, 2026

Navigation Menu

Repository navigation

Rollup of 15 pull requests - #165393

Rollup of 15 pull requests#165393
JonathanBrouwer wants to merge 102 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-6D6mcCK

JonathanBrouwer commented Nov 3, 2026

Uh oh!

JonathanBrouwer commented Nov 3, 2026

Uh oh!

rust-bors Bot commented Nov 3, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented Nov 3, 2026

Uh oh!

rust-bors Bot commented Nov 3, 2026

Uh oh!

rust-log-analyzer commented Nov 3, 2026

Uh oh!

rust-log-analyzer commented Nov 3, 2026

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

19 participants

Conversation

JonathanBrouwer commented Nov 3, 2026

Uh oh!

JonathanBrouwer commented Nov 3, 2026

Uh oh!

rust-bors Bot commented Nov 3, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented Nov 3, 2026

Uh oh!

rust-bors Bot commented Nov 3, 2026

Uh oh!

rust-log-analyzer commented Nov 3, 2026

Uh oh!

rust-log-analyzer commented Nov 3, 2026

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

19 participants