diff options
author | Florian Diebold <[email protected]> | 2019-07-07 17:14:56 +0100 |
---|---|---|
committer | Florian Diebold <[email protected]> | 2019-07-08 20:20:17 +0100 |
commit | 15862fc04183c7f9b3f3af666336a594a6a52cd9 (patch) | |
tree | 3593ee969c943d4881839e527e4305a1c3db2991 /crates/ra_hir/src/ty/infer.rs | |
parent | b1b12072eddaf989fb08ed7a2e39ec2dbbb83dde (diff) |
Use environment for associated type normalization as well
Diffstat (limited to 'crates/ra_hir/src/ty/infer.rs')
-rw-r--r-- | crates/ra_hir/src/ty/infer.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crates/ra_hir/src/ty/infer.rs b/crates/ra_hir/src/ty/infer.rs index f8839ebd2..f6cf61ad2 100644 --- a/crates/ra_hir/src/ty/infer.rs +++ b/crates/ra_hir/src/ty/infer.rs | |||
@@ -356,7 +356,8 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> { | |||
356 | }; | 356 | }; |
357 | } | 357 | } |
358 | Obligation::Projection(pr) => { | 358 | Obligation::Projection(pr) => { |
359 | let canonicalized = self.canonicalizer().canonicalize_projection(pr.clone()); | 359 | let in_env = InEnvironment::new(self.trait_env.clone(), pr.clone()); |
360 | let canonicalized = self.canonicalizer().canonicalize_projection(in_env); | ||
360 | let solution = self | 361 | let solution = self |
361 | .db | 362 | .db |
362 | .normalize(self.resolver.krate().unwrap(), canonicalized.value.clone()); | 363 | .normalize(self.resolver.krate().unwrap(), canonicalized.value.clone()); |