Rollup of 14 pull requests by JonathanBrouwer · Pull Request #156670 · rust-lang/rust

JonathanBrouwer · 2026-05-17T13:52:44Z

Successful merges:

Remove redundant information in rustc_abi::Variants #151742 (Remove redundant information in rustc_abi::Variants)
Add interior-mutability suggestion to static_mut_refs #151362 (Add interior-mutability suggestion to static_mut_refs)
compiler: suggest .collect() when String is expected and Iterator is found #156121 (compiler: suggest .collect() when String is expected and Iterator is found)
Emit retags in codegen to support BorrowSanitizer (part 1) #156208 (Emit retags in codegen to support BorrowSanitizer (part 1))
Split LintExpectationIds #156596 (Split LintExpectationIds)
ci: Update FreeBSD version to FreeBSD 14 #156607 (ci: Update FreeBSD version to FreeBSD 14)
suggest hex escapes for C-style escapes #156376 (suggest hex escapes for C-style escapes)
Test EII UI tests with prefer-dynamic #156577 (Test EII UI tests with prefer-dynamic)
explicit tail calls: ignore some tests on unsupported LLVM targets #156585 (explicit tail calls: ignore some tests on unsupported LLVM targets)
Avoid rustfix suggestions for macro-expanded unused imports #156598 (Avoid rustfix suggestions for macro-expanded unused imports)
rustdoc: add test case for -Drustdoc:: and --cap-lints #156616 (rustdoc: add test case for -Drustdoc:: and --cap-lints)
Add regression test for issue #41261 #156633 (Add regression test for issue Unclear error with type inference failure #41261)
rename unexpected_try_recover function #156635 (rename unexpected_try_recover function)
minor rustc_mir_transform cleanup #156636 (minor rustc_mir_transform cleanup)

…r` is found This commit adds a diagnostic suggestion to help users who forget to call `.collect()` when they have an iterator and the function or variable expects a `String`. The logic checks if the expected type is `std::string::String` and if the found type implements the `Iterator` trait, if so the compiler provides a suggestion to add `.collect()` Includes also a UI test to verify if the suggestion appears correctly

Co-authored-by: Qai Juang <qaijuang@gmail.com>

For now, this is a 1-to-1 copy of `LayoutData`, but this will change.

It was always set to `Variants::Single`.

Enum variants always have `Arbitrary` layout, so the enum isn't needed.

This field is only used during layout calculations, so re-synthetized `LayoutData`s for enum variants can use a dummy value instead.

Reusing the alignment of the enclosing enum in `LayoutData::for_variant` doesn't appear to cause any issues.

It has a single call site.

It's always `None`.

FreeBSD 12 & 13 are now EOL. The decision to move to FreeBSD 13 was not implemented due to the issues with the toolchain. Now that FreeBSD 14 is the most recent supported version, we should use it for builds in CI. Signed-off-by: Kajetan Puchalski <kajetan.puchalski@arm.com>

This works, but I couldn't find any test cases for it.

`LintExpectationId` has two variants, `Unstable` and `Stable`. There are some places where both variants are possible, but there are also places where only one of `Unstable` or `Stable` is possible. This commit encodes this into the type system by introducing new types `UnstableLintExpectationId` and `StableLintExpectationId`. The variants of `LintExpectationId` now enclose these. This makes it clearer what values are possible where. Other things of note: - `LintLevelsProvider` gets an associated type and some method changes. - `LintContext` gets an associated type. - `LevelSpec` is made generic. `UnstableLevelSpec` and `StableLevelSpec` typedefs are added. - The unstable types are now guaranteed by the type system to never be stably hashed. Previously this was a runtime check.

I find these make the code harder to understand.

Describing things that took me a while to work out.

Remove redundant information in `rustc_abi::Variants` Follow-up to rust-lang#151040; partially addresses rust-lang#113988. Replaces the nested `LayoutData` in `Variants::Multiple` by a new, smaller `VariantLayout` struct, and adjust `LayoutData::for_variant`and the layout algorithm in consequence. This PR is best reviewed commit-by-commit.

JonathanBrouwer · 2026-05-17T13:52:54Z

@bors r+ rollup=never p=5

Trying commonly failed jobs
@bors try jobs=dist-various-1,test-various,x86_64-gnu-aux,x86_64-gnu-llvm-21-3,x86_64-msvc-1,aarch64-apple,x86_64-mingw-1,i686-msvc-2

rust-bors · 2026-05-17T13:52:56Z

📌 Commit fc7ac3d has been approved by JonathanBrouwer

It is now in the queue for this repository.

Rollup of 14 pull requests try-job: dist-various-1 try-job: test-various try-job: x86_64-gnu-aux try-job: x86_64-gnu-llvm-21-3 try-job: x86_64-msvc-1 try-job: aarch64-apple try-job: x86_64-mingw-1 try-job: i686-msvc-2

rust-bors · 2026-05-17T16:56:46Z

☀️ Try build successful (CI)
Build commit: d44213c (d44213c0ff8d25571887447e119383412fee1fee, parent: ba0949ab745985a442e274ba52e8fb348cb0c662)

…uwer Rollup of 14 pull requests Successful merges: - #151742 (Remove redundant information in `rustc_abi::Variants`) - #151362 (Add interior-mutability suggestion to `static_mut_refs`) - #156121 (compiler: suggest `.collect()` when `String` is expected and `Iterator` is found) - #156208 (Emit retags in codegen to support BorrowSanitizer (part 1)) - #156596 (Split `LintExpectationId`s) - #156607 (ci: Update FreeBSD version to FreeBSD 14) - #156376 (suggest hex escapes for C-style escapes) - #156577 (Test EII UI tests with prefer-dynamic) - #156585 (explicit tail calls: ignore some tests on unsupported LLVM targets) - #156598 (Avoid rustfix suggestions for macro-expanded unused imports) - #156616 (rustdoc: add test case for `-Drustdoc::` and `--cap-lints`) - #156633 (Add regression test for issue #41261) - #156635 (rename unexpected_try_recover function) - #156636 (minor `rustc_mir_transform` cleanup)

rust-log-analyzer · 2026-05-17T19:07:47Z

The job x86_64-gnu-llvm-21-1 failed! Check out the build log: (web) (plain enhanced) (plain)

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

test expr_store::tests::body::block::inner_item_smoke ... ok
test expr_store::tests::body::array_element_cfg ... ok
test expr_store::scope::tests::while_let_adds_binding ... ok
test expr_store::tests::body::async_fn_weird_param_patterns ... ok
error: test failed, to rerun pass `-p hir-def --lib`

Caused by:
  process didn't exit successfully: `/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/hir_def-f381e8bd2208ec8b '--skip=tests::smoke_test_real_sysroot_cargo' --skip=check_code_formatting -Z unstable-options --format json` (signal: 11, SIGSEGV: invalid memory reference)
Bootstrap failed while executing `--stage 2 test --skip tests --skip coverage-map --skip coverage-run --skip library --skip tidyselftest`
Build completed unsuccessfully in 1:01:43
  local time: Sun May 17 19:07:32 UTC 2026
  network time: Sun, 17 May 2026 19:07:33 GMT
##[error]Process completed with exit code 1.

rust-bors · 2026-05-17T19:08:55Z

💔 Test for d97c1f0 failed: CI. Failed job:

auto - x86_64-gnu-llvm-21-1 (web logs, enhanced plaintext logs)

JonathanBrouwer · 2026-05-17T19:25:16Z

@bors retry

thiago-fealves and others added 30 commits May 4, 2026 10:55

Update compiler/rustc_hir_typeck/src/fn_ctxt/suggestions.rs

e1941ff

Co-authored-by: Qai Juang <qaijuang@gmail.com>

Introduce VariantLayout struct

464dc07

For now, this is a 1-to-1 copy of `LayoutData`, but this will change.

Remove redundant VariantLayout.variants field

1162bdc

It was always set to `Variants::Single`.

Store FieldsShape::Arbitrary fields directly in VariantLayout

0569574

Enum variants always have `Arbitrary` layout, so the enum isn't needed.

Remove unused VariantLayout.randomization_seed field

3459964

This field is only used during layout calculations, so re-synthetized `LayoutData`s for enum variants can use a dummy value instead.

Remove per-variant alignment in VariantLayout

75015f4

Reusing the alignment of the enclosing enum in `LayoutData::for_variant` doesn't appear to cause any issues.

Inline and remove late_lint_crate_inner

19c6365

It has a single call site.

Remove an unnecessary push argument

4033268

It's always `None`.

Avoid rustfix suggestions for macro-expanded unused imports

ecf0191

comment for issue id

9d76912

use edition 2021

209ee9d

Add trait methods for experimental retags to cg.

e15861b

rustdoc: add test case for -Drustdoc:: CLI param

5f2e455

This works, but I couldn't find any test cases for it.

rustdoc: add test case for --cap-lints=allow

0344a02

Test EII UI tests with prefer-dynamic

124126e

Add regression test for issue 41261

87821d9

fix

6d91f14

minor rustc_mir_transform cleanup

053761d

Remove some low-value method wrappers

36738a1

I find these make the code harder to understand.

Add some comments to ShallowLintLevelMap

6c9d519

Describing things that took me a while to work out.

suggest hex escapes for C-style escapes

e599831

ignore some musttail tests on unsupported LLVM targets

04c325f

Add interior-mutability suggestion to static_mut_refs

2071c66

Tweak note condition

cbaee5d

Add test for the case span is unavailable

33d92f7

Add FIXME for interior_mutability_suggestion

ee8949e

rust-bors Bot added the rollup A PR which is a rollup label May 17, 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 May 17, 2026

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 May 17, 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 May 17, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 14 pull requests#156670

Rollup of 14 pull requests#156670
JonathanBrouwer wants to merge 43 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-u90lYRn

JonathanBrouwer commented May 17, 2026 •

edited by rustbot

Loading

Uh oh!

JonathanBrouwer commented May 17, 2026

Uh oh!

rust-bors Bot commented May 17, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented May 17, 2026

Uh oh!

This comment has been minimized.

rust-log-analyzer commented May 17, 2026

Uh oh!

rust-bors Bot commented May 17, 2026

Uh oh!

JonathanBrouwer commented May 17, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

17 participants

Uh oh!

Conversation

JonathanBrouwer commented May 17, 2026 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

JonathanBrouwer commented May 17, 2026

Uh oh!

rust-bors Bot commented May 17, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented May 17, 2026

Uh oh!

This comment has been minimized.

rust-log-analyzer commented May 17, 2026

Uh oh!

rust-bors Bot commented May 17, 2026

Uh oh!

JonathanBrouwer commented May 17, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

17 participants

JonathanBrouwer commented May 17, 2026 •

edited by rustbot

Loading