diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-10-17 16:52:17 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2019-10-17 16:52:17 +0100 |
commit | 6df2bcd7ca97261b59ca04a85b7355432a63c0d9 (patch) | |
tree | e2210c835eb976f7ee04ee12b4ba5f76ff1a26f9 /crates/ra_hir/src/ty/infer | |
parent | 762fce5bdd166144c33871ae5b2594684eb0169e (diff) | |
parent | a6b980d6d41dda02d031d0f78e3e99c04e49cc9b (diff) |
Merge #2025
2025: Bump deps r=matklad a=lnicola
Co-authored-by: Laurențiu Nicola <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/ty/infer')
-rw-r--r-- | crates/ra_hir/src/ty/infer/unify.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crates/ra_hir/src/ty/infer/unify.rs b/crates/ra_hir/src/ty/infer/unify.rs index 014c7981f..ca33cc7f8 100644 --- a/crates/ra_hir/src/ty/infer/unify.rs +++ b/crates/ra_hir/src/ty/infer/unify.rs | |||
@@ -54,7 +54,9 @@ where | |||
54 | // recursive type | 54 | // recursive type |
55 | return tv.fallback_value(); | 55 | return tv.fallback_value(); |
56 | } | 56 | } |
57 | if let Some(known_ty) = self.ctx.var_unification_table.probe_value(inner).known() { | 57 | if let Some(known_ty) = |
58 | self.ctx.var_unification_table.inlined_probe_value(inner).known() | ||
59 | { | ||
58 | self.var_stack.push(inner); | 60 | self.var_stack.push(inner); |
59 | let result = self.do_canonicalize_ty(known_ty.clone()); | 61 | let result = self.do_canonicalize_ty(known_ty.clone()); |
60 | self.var_stack.pop(); | 62 | self.var_stack.pop(); |