From 15862fc04183c7f9b3f3af666336a594a6a52cd9 Mon Sep 17 00:00:00 2001
From: Florian Diebold <flodiebold@gmail.com>
Date: Sun, 7 Jul 2019 18:14:56 +0200
Subject: Use environment for associated type normalization as well

---
 crates/ra_hir/src/ty/infer/unify.rs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'crates/ra_hir/src/ty/infer')

diff --git a/crates/ra_hir/src/ty/infer/unify.rs b/crates/ra_hir/src/ty/infer/unify.rs
index ad2eefcaf..2ed326cd5 100644
--- a/crates/ra_hir/src/ty/infer/unify.rs
+++ b/crates/ra_hir/src/ty/infer/unify.rs
@@ -129,10 +129,14 @@ where
 
     pub fn canonicalize_projection(
         mut self,
-        projection: ProjectionPredicate,
-    ) -> Canonicalized<ProjectionPredicate> {
-        let result = self.do_canonicalize_projection_predicate(projection);
-        self.into_canonicalized(result)
+        projection: InEnvironment<ProjectionPredicate>,
+    ) -> Canonicalized<InEnvironment<ProjectionPredicate>> {
+        let result = self.do_canonicalize_projection_predicate(projection.value);
+        // FIXME canonicalize env
+        self.into_canonicalized(InEnvironment {
+            value: result,
+            environment: projection.environment,
+        })
     }
 }
 
-- 
cgit v1.2.3