diff options
| author | bors <bors@rust-lang.org> | 2025-04-30 20:42:22 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-04-30 20:42:22 +0000 |
| commit | b45dd71d1824f176fba88f6c40467030a16afa2c (patch) | |
| tree | e411711ed4353d3828f34aebca7bdeda8f357d28 /compiler/rustc_trait_selection/src/solve.rs | |
| parent | 251cda5e1f0057eb04fd9fc1653f2f1e010e8f97 (diff) | |
| parent | a477172cedb83e1b8295bb20f4bff6e79f9e7bb1 (diff) | |
| download | rust-b45dd71d1824f176fba88f6c40467030a16afa2c.tar.gz rust-b45dd71d1824f176fba88f6c40467030a16afa2c.zip | |
Auto merge of #140529 - matthiaskrgr:rollup-jpaa2ky, r=matthiaskrgr
Rollup of 10 pull requests Successful merges: - #140385 (Subtree update of `rust-analyzer`) - #140458 (Fix for async drop ice with partly dropped tuple) - #140465 (chore: edit and move tests) - #140467 (Don't FCW assoc consts in patterns) - #140468 (Minor tweaks to make some normalization (adjacent) code less confusing) - #140470 (CI: rfl: move job forward to Linux v6.15-rc4) - #140476 (chore: delete unused ui/auxiliary crates) - #140481 (Require sanitizers be enabled for asan_odr_windows.rs) - #140486 (rustfmt: Also allow bool literals as first item of let chain) - #140494 (Parser: Document restrictions) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_trait_selection/src/solve.rs')
| -rw-r--r-- | compiler/rustc_trait_selection/src/solve.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_trait_selection/src/solve.rs b/compiler/rustc_trait_selection/src/solve.rs index 0c2451a80a7..5a5d16167d2 100644 --- a/compiler/rustc_trait_selection/src/solve.rs +++ b/compiler/rustc_trait_selection/src/solve.rs @@ -11,6 +11,6 @@ pub use fulfill::{FulfillmentCtxt, NextSolverError}; pub(crate) use normalize::deeply_normalize_for_diagnostics; pub use normalize::{ deeply_normalize, deeply_normalize_with_skipped_universes, - deeply_normalize_with_skipped_universes_and_ambiguous_goals, + deeply_normalize_with_skipped_universes_and_ambiguous_coroutine_goals, }; pub use select::InferCtxtSelectExt; |