diff options
| author | bors <bors@rust-lang.org> | 2025-03-24 01:03:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-03-24 01:03:21 +0000 |
| commit | ae8ab87de4d8caab5d91a027bc19bb5d5e8a3691 (patch) | |
| tree | a96cd1131d237664ee96e872d0fe2aeab2abc5c0 /compiler/rustc_trait_selection/src/solve/delegate.rs | |
| parent | 7290b04b0a46de2118968aa556bfc0970aac6661 (diff) | |
| parent | 0e95f962d9718a7680ad8c10aa747a120da9ed5b (diff) | |
| download | rust-ae8ab87de4d8caab5d91a027bc19bb5d5e8a3691.tar.gz rust-ae8ab87de4d8caab5d91a027bc19bb5d5e8a3691.zip | |
Auto merge of #138873 - jhpratt:rollup-tggrbxl, r=jhpratt
Rollup of 10 pull requests Successful merges: - #137593 (fix download-llvm logic for subtree sync branches) - #137736 (Don't attempt to export compiler-builtins symbols from rust dylibs) - #138135 (Simplify `PartialOrd` on tuples containing primitives) - #138321 ([bootstrap] Distribute split debuginfo if present) - #138574 (rustdoc: be more strict about "Methods from Deref") - #138606 (Fix missing rustfmt in msi installer - cont) - #138671 (Fix `FileType` `PartialEq` implementation on Windows) - #138728 (Update `compiler-builtins` to 0.1.152) - #138783 (Cache current_dll_path output) - #138846 (Tweaks to writeback and `Obligation -> Goal` conversion) Failed merges: - #138755 ([rustdoc] Remove duplicated loop when computing doc cfgs) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_trait_selection/src/solve/delegate.rs')
| -rw-r--r-- | compiler/rustc_trait_selection/src/solve/delegate.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_trait_selection/src/solve/delegate.rs b/compiler/rustc_trait_selection/src/solve/delegate.rs index af5a60027ba..3d9a90eb74e 100644 --- a/compiler/rustc_trait_selection/src/solve/delegate.rs +++ b/compiler/rustc_trait_selection/src/solve/delegate.rs @@ -96,7 +96,7 @@ impl<'tcx> rustc_next_trait_solver::delegate::SolverDelegate for SolverDelegate< ) -> Option<Vec<Goal<'tcx, ty::Predicate<'tcx>>>> { crate::traits::wf::unnormalized_obligations(&self.0, param_env, arg, DUMMY_SP, CRATE_DEF_ID) .map(|obligations| { - obligations.into_iter().map(|obligation| obligation.into()).collect() + obligations.into_iter().map(|obligation| obligation.as_goal()).collect() }) } |