diff options
Diffstat (limited to 'crates/ra_hir/src/expr.rs')
-rw-r--r-- | crates/ra_hir/src/expr.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir/src/expr.rs b/crates/ra_hir/src/expr.rs index 869879bdf..8c4c63fda 100644 --- a/crates/ra_hir/src/expr.rs +++ b/crates/ra_hir/src/expr.rs | |||
@@ -46,7 +46,7 @@ pub(crate) fn resolver_for_scope( | |||
46 | let scopes = owner.expr_scopes(db); | 46 | let scopes = owner.expr_scopes(db); |
47 | let scope_chain = scopes.scope_chain(scope_id).collect::<Vec<_>>(); | 47 | let scope_chain = scopes.scope_chain(scope_id).collect::<Vec<_>>(); |
48 | for scope in scope_chain.into_iter().rev() { | 48 | for scope in scope_chain.into_iter().rev() { |
49 | r = r.push_expr_scope(owner, Arc::clone(&scopes), scope); | 49 | r = r.push_expr_scope(owner.into(), Arc::clone(&scopes), scope); |
50 | } | 50 | } |
51 | r | 51 | r |
52 | } | 52 | } |
@@ -152,7 +152,7 @@ impl<'a, 'b> ExprValidator<'a, 'b> { | |||
152 | _ => return, | 152 | _ => return, |
153 | }; | 153 | }; |
154 | 154 | ||
155 | let std_result_ctor = TypeCtor::Adt(Adt::Enum(std_result_enum)); | 155 | let std_result_ctor = TypeCtor::Adt(Adt::Enum(std_result_enum.into())); |
156 | let params = match &mismatch.expected { | 156 | let params = match &mismatch.expected { |
157 | Ty::Apply(ApplicationTy { ctor, parameters }) if ctor == &std_result_ctor => parameters, | 157 | Ty::Apply(ApplicationTy { ctor, parameters }) if ctor == &std_result_ctor => parameters, |
158 | _ => return, | 158 | _ => return, |