Merge #3259

3259: Normalize associated types in types coming from Chalk r=matklad a=flodiebold

Fixes #3232.

Co-authored-by: Florian Diebold <[email protected]>

2 files changed, 46 insertions, 1 deletions

diff --git a/crates/ra_hir_ty/src/infer/unify.rs b/crates/ra_hir_ty/src/infer/unify.rs
index 9c7996572..2d03c5c33 100644
--- a/crates/ra_hir_ty/src/infer/unify.rs
+++ b/crates/ra_hir_ty/src/infer/unify.rs
@@ -161,7 +161,10 @@ impl<T> Canonicalized<T> {
         let new_vars = Substs((0..solution.num_vars).map(|_| ctx.table.new_type_var()).collect());
         for (i, ty) in solution.value.into_iter().enumerate() {
             let var = self.free_vars[i];
-            ctx.table.unify(&Ty::Infer(var), &ty.subst_bound_vars(&new_vars));
+            // eagerly replace projections in the type; we may be getting types
+            // e.g. from where clauses where this hasn't happened yet
+            let ty = ctx.normalize_associated_types_in(ty.subst_bound_vars(&new_vars));
+            ctx.table.unify(&Ty::Infer(var), &ty);
         }
     }
 }
diff --git a/crates/ra_hir_ty/src/tests/traits.rs b/crates/ra_hir_ty/src/tests/traits.rs
index aa2018944..7d796d0b9 100644
--- a/crates/ra_hir_ty/src/tests/traits.rs
+++ b/crates/ra_hir_ty/src/tests/traits.rs
@@ -1910,3 +1910,45 @@ fn test() -> impl Trait<i32> {
     "###
     );
 }
+
+#[test]
+fn assoc_types_from_bounds() {
+    assert_snapshot!(
+        infer(r#"
+//- /main.rs
+#[lang = "fn_once"]
+trait FnOnce<Args> {
+    type Output;
+}
+
+trait T {
+    type O;
+}
+
+impl T for () {
+    type O = ();
+}
+
+fn f<X, F>(_v: F)
+where
+    X: T,
+    F: FnOnce(&X::O),
+{ }
+
+fn main() {
+    f::<(), _>(|z| { z; });
+}
+"#),
+        @r###"
+    [147; 149) '_v': F
+    [192; 195) '{ }': ()
+    [207; 238) '{     ... }); }': ()
+    [213; 223) 'f::<(), _>': fn f<(), |&()| -> ()>(|&()| -> ()) -> ()
+    [213; 235) 'f::<()... z; })': ()
+    [224; 234) '|z| { z; }': |&()| -> ()
+    [225; 226) 'z': &()
+    [228; 234) '{ z; }': ()
+    [230; 231) 'z': &()
+    "###
+    );
+}