Uplift elaboration

2024-07-06 12:21:00 -04:00
parent 58aad3c72c
commit 90423a7abb
11 changed files with 437 additions and 369 deletions
--- a/compiler/rustc_next_trait_solver/src/solve/assembly/structural_traits.rs
+++ b/compiler/rustc_next_trait_solver/src/solve/assembly/structural_traits.rs
@@ -669,7 +669,9 @@ where
    let cx = ecx.cx();
    let mut requirements = vec![];
    requirements.extend(
-        cx.explicit_super_predicates_of(trait_ref.def_id).iter_instantiated(cx, trait_ref.args),
+        cx.explicit_super_predicates_of(trait_ref.def_id)
+            .iter_instantiated(cx, trait_ref.args)
+            .map(|(pred, _)| pred),
    );

    // FIXME(associated_const_equality): Also add associated consts to