Rollup of 6 pull requests by GuillaumeGomez · Pull Request #156652 · rust-lang/rust

GuillaumeGomez · 2026-05-16T21:30:58Z

Successful merges:

Remove driver_lint_caps #152852 (Remove driver_lint_caps)
compiler: suggest .collect() when String is expected and Iterator is found #156121 (compiler: suggest .collect() when String is expected and Iterator is found)
[style] rustfmt matches with comments in or-patterns #156518 ([style] rustfmt matches with comments in or-patterns)
Split LintExpectationIds #156596 (Split LintExpectationIds)
Test EII UI tests with prefer-dynamic #156577 (Test EII UI tests with prefer-dynamic)
Add regression test for issue #41261 #156633 (Add regression test for issue Unclear error with type inference failure #41261)

…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>

Using rust-lang/rustfmt#6893, reformat the codebase. The result is that matches that *would have* been formatted under normal circumstances get their expected format. These match expressions were being entirely skipped because they contain or-patterns with comments in between patterns, causing rustfmt to bail out entirely. The or-patterns with comments themselves remain untouched, but now the match arm bodies and other patterns without comments do get formatted under that PR. Because the fix in rustfmt isn't landed yet, I reworked some of the or-patterns with comments so that formatting doesn't regress. Tried doing this only in larger blocks that are more likely to regress in the meantime.

Thanks VSCode!

It has a single call site.

It's always `None`.

It was only used by rustdoc and doesn't seem like it was necessary there. No tests fail at least.

`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.

…notriddle Remove driver_lint_caps It was only used by rustdoc and doesn't seem like it was necessary there. No tests fail at least. r? rust-lang/rustdoc

…ing, r=estebank compiler: suggest `.collect()` when `String` is expected and `Iterator` 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

[style] rustfmt `match`es with comments in or-patterns Using rust-lang/rustfmt#6893, I reformatted the whole codebase. The result is that `match`es that *should have* been formatted under normal circumstances but are getting skipped now got their expected format. These match expressions were being entirely skipped because they contain or-patterns with comments in between patterns, causing rustfmt to bail out entirely. The or-patterns with comments themselves remain untouched, but now the match arm bodies and other patterns without comments do get formatted under that PR. Because the fix in rustfmt isn't landed yet, I reworked some of the or-patterns with comments so that formatting doesn't regress. Tried doing this only in larger blocks that are more likely to regress in the meantime. (Introduced and) removed a bunch of stray backticks \` likely left after an editor autoclosed the intended closing \`, resulting in <code>\`name\`\`</code> in comments.

@GuillaumeGomez

… r=GuillaumeGomez Split `LintExpectationId`s This PR makes clearer where stable and unstable `LintExpectationIds` can occur, plus a few other small cleanups. Details in individual commits. r? @GuillaumeGomez

…=mejrs Test EII UI tests with prefer-dynamic Tracking issue: rust-lang#125418 Remove `no-prefer-dynamic` from the EII UI tests now that rust-lang#153648 fixed exporting EII declaration aliases from dylibs. Fixes rust-lang#151271. Tested with: ```sh python3 x.py test tests/ui/eii --force-rerun ```

…est, r=mu001999 Add regression test for issue rust-lang#41261 Adds a regression test for rust-lang#41261.

GuillaumeGomez · 2026-05-16T21:31:15Z

@bors r+ p=5 rollup=never

rust-bors · 2026-05-16T21:31:17Z

📌 Commit 069fdd2 has been approved by GuillaumeGomez

It is now in the queue for this repository.

Rollup of 6 pull requests Successful merges: - #152852 (Remove driver_lint_caps) - #156121 (compiler: suggest `.collect()` when `String` is expected and `Iterator` is found) - #156518 ([style] rustfmt `match`es with comments in or-patterns) - #156596 (Split `LintExpectationId`s) - #156577 (Test EII UI tests with prefer-dynamic) - #156633 (Add regression test for issue #41261)

rust-log-analyzer · 2026-05-16T22:58:05Z

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

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

 Documenting rustc_error_messages v0.0.0 (/checkout/compiler/rustc_error_messages)
 Documenting rustc_hir_id v0.0.0 (/checkout/compiler/rustc_hir_id)
 Documenting rustc_ast_ir v0.0.0 (/checkout/compiler/rustc_ast_ir)
 Documenting rustc_baked_icu_data v0.0.0 (/checkout/compiler/rustc_baked_icu_data)
warning: hidden lifetime parameters in types are deprecated
  --> compiler/rustc_baked_icu_data/src/data/list_and_v1.rs.data:34:47
   |
34 | ...   fn load(&self, req: icu_provider::DataRequest) -> Result<icu_provider::DataResponse<icu_list::provider::ListAndV1>, icu_provid...
   |                           --------------^^^^^^^^^^^
   |                           |
   |                           expected lifetime parameter
   |
  ::: compiler/rustc_baked_icu_data/src/lib.rs:32:5
   |
32 |     impl_data_provider!(BakedDataProvider);
   |     -------------------------------------- in this macro invocation
   |
note: the lint level is defined here
  --> <crate attribute>:1:9
   |
 1 | #![warn(rust_2018_idioms)]
   |         ^^^^^^^^^^^^^^^^
   = note: `#[warn(elided_lifetimes_in_paths)]` implied by `#[warn(rust_2018_idioms)]`
   = note: this warning originates in the macro `impl_list_and_v1` which comes from the expansion of the macro `impl_data_provider` (in Nightly builds, run with -Z macro-backtrace for more info)
help: indicate the anonymous lifetime
   |
34 |             fn load(&self, req: icu_provider::DataRequest<'_>) -> Result<icu_provider::DataResponse<icu_list::provider::ListAndV1>, icu_provider::DataError> {
   |                                                          ++++

 Documenting rustc_windows_rc v0.0.0 (/checkout/compiler/rustc_windows_rc)
 Documenting rustc_parse_format v0.0.0 (/checkout/compiler/rustc_parse_format)
 Documenting rustc_lexer v0.0.0 (/checkout/compiler/rustc_lexer)
---
warning: rustc_llvm@0.0.0: Inherited flag "-fembed-bitcode=all" is not supported by the currently used CC
warning: rustc_llvm@0.0.0: Inherited flag "-fembed-bitcode=all" is not supported by the currently used CC
warning: rustc_llvm@0.0.0: Inherited flag "-fembed-bitcode=all" is not supported by the currently used CC
warning: rustc_llvm@0.0.0: Inherited flag "-fembed-bitcode=all" is not supported by the currently used CC
Bootstrap failed while executing `dist --host x86_64-unknown-linux-gnu --target x86_64-unknown-linux-gnu --include-default-paths build-manifest bootstrap`
Command `/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo doc -Zwarnings --target x86_64-unknown-linux-gnu -Zbinary-dep-depinfo -j 8 -Zroot-dir=/checkout --locked --color=always --profile=release --features 'jemalloc llvm rustc' --manifest-path /checkout/compiler/rustc/Cargo.toml -Zskip-rustdoc-fingerprint --no-deps -Zrustdoc-map -p rustc-main -p rustc_abi -p rustc_arena -p rustc_ast -p rustc_ast_ir -p rustc_ast_lowering -p rustc_ast_passes -p rustc_ast_pretty -p rustc_attr_parsing -p rustc_baked_icu_data -p rustc_borrowck -p rustc_builtin_macros -p rustc_codegen_llvm -p rustc_codegen_ssa -p rustc_const_eval -p rustc_data_structures -p rustc_driver -p rustc_driver_impl -p rustc_error_codes -p rustc_error_messages -p rustc_errors -p rustc_expand -p rustc_feature -p rustc_fs_util -p rustc_graphviz -p rustc_hashes -p rustc_hir -p rustc_hir_analysis -p rustc_hir_id -p rustc_hir_pretty -p rustc_hir_typeck -p rustc_incremental -p rustc_index -p rustc_index_macros -p rustc_infer -p rustc_interface -p rustc_lexer -p rustc_lint -p rustc_lint_defs -p rustc_llvm -p rustc_log -p rustc_macros -p rustc_metadata -p rustc_middle -p rustc_mir_build -p rustc_mir_dataflow -p rustc_mir_transform -p rustc_monomorphize -p rustc_next_trait_solver -p rustc_parse -p rustc_parse_format -p rustc_passes -p rustc_pattern_analysis -p rustc_privacy -p rustc_proc_macro -p rustc_public -p rustc_public_bridge -p rustc_query_impl -p rustc_resolve -p rustc_sanitizers -p rustc_serialize -p rustc_session -p rustc_span -p rustc_symbol_mangling -p rustc_target -p rustc_thread_pool -p rustc_trait_selection -p rustc_traits -p rustc_transmute -p rustc_ty_utils -p rustc_type_ir -p rustc_type_ir_macros -p rustc_windows_rc [workdir=/checkout]` failed with exit code 101
Created at: src/bootstrap/src/core/build_steps/doc.rs:916:25
Executed at: src/bootstrap/src/core/build_steps/doc.rs:977:26

--- BACKTRACE vvv
   0: <bootstrap::utils::exec::DeferredCommand>::finish_process
             at /checkout/src/bootstrap/src/utils/exec.rs:939:17
   1: <bootstrap::utils::exec::DeferredCommand>::wait_for_output::<&bootstrap::utils::exec::ExecutionContext>
             at /checkout/src/bootstrap/src/utils/exec.rs:831:21
   2: <bootstrap::utils::exec::ExecutionContext>::run
             at /checkout/src/bootstrap/src/utils/exec.rs:741:45
   3: <bootstrap::utils::exec::BootstrapCommand>::run::<&bootstrap::core::builder::Builder>
             at /checkout/src/bootstrap/src/utils/exec.rs:339:27
   4: <bootstrap::core::build_steps::doc::Rustc as bootstrap::core::builder::Step>::run
             at /checkout/src/bootstrap/src/core/build_steps/doc.rs:977:26
   5: <bootstrap::core::builder::Builder>::ensure::<bootstrap::core::build_steps::doc::Rustc>
             at /checkout/src/bootstrap/src/core/builder/mod.rs:1595:36
   6: <bootstrap::core::build_steps::doc::Rustc as bootstrap::core::builder::Step>::make_run
             at /checkout/src/bootstrap/src/core/build_steps/doc.rs:886:21
   7: <bootstrap::core::builder::StepDescription>::maybe_run
             at /checkout/src/bootstrap/src/core/builder/mod.rs:476:13
   8: bootstrap::core::builder::cli_paths::match_paths_to_steps_and_run
             at /checkout/src/bootstrap/src/core/builder/cli_paths.rs:141:22
   9: <bootstrap::core::builder::Builder>::run_step_descriptions
             at /checkout/src/bootstrap/src/core/builder/mod.rs:1138:9
---
  12: <bootstrap::core::builder::Builder>::ensure::<bootstrap::core::build_steps::dist::Docs>
             at /checkout/src/bootstrap/src/core/builder/mod.rs:1595:36
  13: <bootstrap::core::build_steps::dist::Docs as bootstrap::core::builder::Step>::make_run
             at /checkout/src/bootstrap/src/core/build_steps/dist.rs:79:21
  14: <bootstrap::core::builder::StepDescription>::maybe_run
             at /checkout/src/bootstrap/src/core/builder/mod.rs:476:13
  15: bootstrap::core::builder::cli_paths::match_paths_to_steps_and_run
             at /checkout/src/bootstrap/src/core/builder/cli_paths.rs:141:22
  16: <bootstrap::core::builder::Builder>::run_step_descriptions
             at /checkout/src/bootstrap/src/core/builder/mod.rs:1138:9
  17: <bootstrap::core::builder::Builder>::execute_cli
             at /checkout/src/bootstrap/src/core/builder/mod.rs:1117:14
  18: <bootstrap::Build>::build
             at /checkout/src/bootstrap/src/lib.rs:803:25
  19: bootstrap::main
             at /checkout/src/bootstrap/src/bin/main.rs:130:11
  20: <fn() as core::ops::function::FnOnce<()>>::call_once
             at /rustc/ef0fb8a2563200e322fa4419f09f65a63742038c/library/core/src/ops/function.rs:250:5
  21: std::sys::backtrace::__rust_begin_short_backtrace::<fn(), ()>
             at /rustc/ef0fb8a2563200e322fa4419f09f65a63742038c/library/std/src/sys/backtrace.rs:166:18
  22: std::rt::lang_start::<()>::{closure#0}
             at /rustc/ef0fb8a2563200e322fa4419f09f65a63742038c/library/std/src/rt.rs:206:18
  23: <&dyn core::ops::function::Fn<(), Output = i32> + core::marker::Sync + core::panic::unwind_safe::RefUnwindSafe as core::ops::function::FnOnce<()>>::call_once
             at /rustc/ef0fb8a2563200e322fa4419f09f65a63742038c/library/core/src/ops/function.rs:287:21
  24: std::panicking::catch_unwind::do_call::<&dyn core::ops::function::Fn<(), Output = i32> + core::marker::Sync + core::panic::unwind_safe::RefUnwindSafe, i32>
             at /rustc/ef0fb8a2563200e322fa4419f09f65a63742038c/library/std/src/panicking.rs:581:40
  25: std::panicking::catch_unwind::<i32, &dyn core::ops::function::Fn<(), Output = i32> + core::marker::Sync + core::panic::unwind_safe::RefUnwindSafe>
             at /rustc/ef0fb8a2563200e322fa4419f09f65a63742038c/library/std/src/panicking.rs:544:19
  26: std::panic::catch_unwind::<&dyn core::ops::function::Fn<(), Output = i32> + core::marker::Sync + core::panic::unwind_safe::RefUnwindSafe, i32>
             at /rustc/ef0fb8a2563200e322fa4419f09f65a63742038c/library/std/src/panic.rs:359:14
  27: std::rt::lang_start_internal::{closure#0}
             at /rustc/ef0fb8a2563200e322fa4419f09f65a63742038c/library/std/src/rt.rs:175:24
  28: std::panicking::catch_unwind::do_call::<std::rt::lang_start_internal::{closure#0}, isize>
             at /rustc/ef0fb8a2563200e322fa4419f09f65a63742038c/library/std/src/panicking.rs:581:40
---
  34: __libc_start_main
  35: <unknown>


Command has failed. Rerun with -v to see more details.
Build completed unsuccessfully in 0:37:20
  local time: Sat May 16 22:57:50 UTC 2026
  network time: Sat, 16 May 2026 22:57:51 GMT
##[error]Process completed with exit code 1.
##[group]Run echo "disk usage:"

rust-bors · 2026-05-16T22:58:44Z

💔 Test for 41c0bc7 failed: CI. Failed job:

auto - dist-x86_64-linux-alt (web logs, enhanced plaintext logs)

GuillaumeGomez · 2026-05-16T23:05:07Z

I have no idea where the failure seems to come from. Closing and let's see which PR will fail...

rust-bors · 2026-05-16T23:05:11Z

This pull request was unapproved due to being closed.

thiago-fealves and others added 19 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>

Remove a bunch of stray backticks

701e494

Thanks VSCode!

Inline and remove late_lint_crate_inner

19c6365

It has a single call site.

Remove an unnecessary push argument

4033268

It's always `None`.

Remove driver_lint_caps

379caad

It was only used by rustdoc and doesn't seem like it was necessary there. No tests fail at least.

Test EII UI tests with prefer-dynamic

124126e

Place comment in the right place

5cd51c0

Add regression test for issue 41261

87821d9

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.

Rollup merge of rust-lang#152852 - bjorn3:remove_driver_lint_caps, r=…

967f43d

…notriddle Remove driver_lint_caps It was only used by rustdoc and doesn't seem like it was necessary there. No tests fail at least. r? rust-lang/rustdoc

Rollup merge of rust-lang#156596 - nnethercote:split-LintExpectation,…

0571ef0

… r=GuillaumeGomez Split `LintExpectationId`s This PR makes clearer where stable and unstable `LintExpectationIds` can occur, plus a few other small cleanups. Details in individual commits. r? @GuillaumeGomez

Rollup merge of rust-lang#156633 - eval-exec:issue-41261-regression-t…

069fdd2

…est, r=mu001999 Add regression test for issue rust-lang#41261 Adds a regression test for rust-lang#41261.

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

GuillaumeGomez closed this May 16, 2026

rust-bors Bot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label May 16, 2026

rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 16, 2026

rust-bors Bot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 16, 2026

GuillaumeGomez deleted the rollup-rm0erAv branch May 16, 2026 23:05

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 6 pull requests#156652

Rollup of 6 pull requests#156652
GuillaumeGomez wants to merge 19 commits into
rust-lang:mainfrom
GuillaumeGomez:rollup-rm0erAv

GuillaumeGomez commented May 16, 2026 •

edited by rustbot

Loading

Uh oh!

GuillaumeGomez commented May 16, 2026

Uh oh!

rust-bors Bot commented May 16, 2026

Uh oh!

This comment has been minimized.

rust-log-analyzer commented May 16, 2026

Uh oh!

rust-bors Bot commented May 16, 2026

Uh oh!

GuillaumeGomez commented May 16, 2026

Uh oh!

rust-bors Bot commented May 16, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

Uh oh!

Conversation

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

Uh oh!

Uh oh!

GuillaumeGomez commented May 16, 2026

Uh oh!

rust-bors Bot commented May 16, 2026

Uh oh!

This comment has been minimized.

rust-log-analyzer commented May 16, 2026

Uh oh!

rust-bors Bot commented May 16, 2026

Uh oh!

GuillaumeGomez commented May 16, 2026

Uh oh!

rust-bors Bot commented May 16, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

GuillaumeGomez commented May 16, 2026 •

edited by rustbot

Loading