diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-12-15 20:08:12 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2019-12-15 20:08:12 +0000 |
commit | 0ef8ace012b19b76ee99b283801d0d17a3b72b4b (patch) | |
tree | 911458abbefcddd06e131c410bd1e1710e77ca95 /crates/ra_hir_ty/src/infer | |
parent | 4e24b25c669965cf6a68c4b8e775cc83615d978a (diff) | |
parent | 91853590a9ee78406e892ca92305edef3a5b9213 (diff) |
Merge #2567
2567: Handle impl Trait more correctly r=flodiebold a=flodiebold
When calling a function, argument-position impl Trait is transparent; same for return-position impl Trait when inside the function.
So in these cases, we need to represent that type not by `Ty::Opaque`, but by a type variable that can be unified with whatever flows into there.
Co-authored-by: Florian Diebold <[email protected]>
Diffstat (limited to 'crates/ra_hir_ty/src/infer')
-rw-r--r-- | crates/ra_hir_ty/src/infer/expr.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crates/ra_hir_ty/src/infer/expr.rs b/crates/ra_hir_ty/src/infer/expr.rs index 2e3cdd53a..924ad3e81 100644 --- a/crates/ra_hir_ty/src/infer/expr.rs +++ b/crates/ra_hir_ty/src/infer/expr.rs | |||
@@ -613,6 +613,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> { | |||
613 | continue; | 613 | continue; |
614 | } | 614 | } |
615 | 615 | ||
616 | let param_ty = self.insert_vars_for_impl_trait(param_ty); | ||
616 | let param_ty = self.normalize_associated_types_in(param_ty); | 617 | let param_ty = self.normalize_associated_types_in(param_ty); |
617 | self.infer_expr_coerce(arg, &Expectation::has_type(param_ty.clone())); | 618 | self.infer_expr_coerce(arg, &Expectation::has_type(param_ty.clone())); |
618 | } | 619 | } |