aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir/src/ty/infer
diff options
context:
space:
mode:
authorFlorian Diebold <[email protected]>2019-07-07 17:14:56 +0100
committerFlorian Diebold <[email protected]>2019-07-08 20:20:17 +0100
commit15862fc04183c7f9b3f3af666336a594a6a52cd9 (patch)
tree3593ee969c943d4881839e527e4305a1c3db2991 /crates/ra_hir/src/ty/infer
parentb1b12072eddaf989fb08ed7a2e39ec2dbbb83dde (diff)
Use environment for associated type normalization as well
Diffstat (limited to 'crates/ra_hir/src/ty/infer')
-rw-r--r--crates/ra_hir/src/ty/infer/unify.rs12
1 files changed, 8 insertions, 4 deletions
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
129 129
130 pub fn canonicalize_projection( 130 pub fn canonicalize_projection(
131 mut self, 131 mut self,
132 projection: ProjectionPredicate, 132 projection: InEnvironment<ProjectionPredicate>,
133 ) -> Canonicalized<ProjectionPredicate> { 133 ) -> Canonicalized<InEnvironment<ProjectionPredicate>> {
134 let result = self.do_canonicalize_projection_predicate(projection); 134 let result = self.do_canonicalize_projection_predicate(projection.value);
135 self.into_canonicalized(result) 135 // FIXME canonicalize env
136 self.into_canonicalized(InEnvironment {
137 value: result,
138 environment: projection.environment,
139 })
136 } 140 }
137} 141}
138 142