Resolve assoc ty predicates in builtin ImplExprs

Author: Nadrieril

frontend/exporter/src/sinto.rs

@@ -65,6 +65,14 @@ impl<S, LL, RR, L: SInto<S, LL>, R: SInto<S, RR>> SInto<S, (LL, RR)> for (L, R)
     }
 }
 
+impl<S, AA, BB, CC, A: SInto<S, AA>, B: SInto<S, BB>, C: SInto<S, CC>> SInto<S, (AA, BB, CC)>
+    for (A, B, C)
+{
+    fn sinto(&self, s: &S) -> (AA, BB, CC) {
+        (self.0.sinto(s), self.1.sinto(s), self.2.sinto(s))
+    }
+}
+
 impl<S, D, T: SInto<S, D>> SInto<S, Option<D>> for Option<T> {
     fn sinto(&self, s: &S) -> Option<D> {
         self.as_ref().map(|x| x.sinto(s))

frontend/exporter/src/traits.rs

@@ -140,7 +140,7 @@ pub enum ImplExprAtom {
         /// FnOnce`.
         impl_exprs: Vec<ImplExpr>,
         /// The values of the associated types for this trait.
-        types: Vec<(DefId, Ty)>,
+        types: Vec<(DefId, Ty, Vec<ImplExpr>)>,
     },
     /// An error happened while resolving traits.
     Error(String),

frontend/exporter/src/traits/resolution.rs

@@ -89,7 +89,7 @@ pub enum ImplExprAtom<'tcx> {
         /// FnOnce`.
         impl_exprs: Vec<ImplExpr<'tcx>>,
         /// The values of the associated types for this trait.
-        types: Vec<(DefId, Ty<'tcx>)>,
+        types: Vec<(DefId, Ty<'tcx>, Vec<ImplExpr<'tcx>>)>,
     },
     /// An error happened while resolving traits.
     Error(String),
@@ -495,7 +495,14 @@ impl<'tcx> PredicateSearcher<'tcx> {
                                 return None;
                             }
                         }
-                        Some((assoc.def_id, ty))
+                        let impl_exprs = self
+                            .resolve_item_implied_predicates(
+                                assoc.def_id,
+                                erased_tref.skip_binder().args,
+                                warn,
+                            )
+                            .ok()?;
+                        Some((assoc.def_id, ty, impl_exprs))
                     })
                     .collect();
                 ImplExprAtom::Builtin {