diff options
Diffstat (limited to 'crates/hir_ty/src/diagnostics/expr.rs')
| -rw-r--r-- | crates/hir_ty/src/diagnostics/expr.rs | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/crates/hir_ty/src/diagnostics/expr.rs b/crates/hir_ty/src/diagnostics/expr.rs index 2751cd304..b2bfd68d4 100644 --- a/crates/hir_ty/src/diagnostics/expr.rs +++ b/crates/hir_ty/src/diagnostics/expr.rs | |||
| @@ -15,7 +15,7 @@ use crate::{ | |||
| 15 | MissingPatFields, RemoveThisSemicolon, | 15 | MissingPatFields, RemoveThisSemicolon, |
| 16 | }, | 16 | }, |
| 17 | utils::variant_data, | 17 | utils::variant_data, |
| 18 | AdtId, InferenceResult, Ty, | 18 | AdtId, InferenceResult, Interner, Ty, TyKind, |
| 19 | }; | 19 | }; |
| 20 | 20 | ||
| 21 | pub(crate) use hir_def::{ | 21 | pub(crate) use hir_def::{ |
| @@ -289,11 +289,10 @@ impl<'a, 'b> ExprValidator<'a, 'b> { | |||
| 289 | let (body, source_map): (Arc<Body>, Arc<BodySourceMap>) = | 289 | let (body, source_map): (Arc<Body>, Arc<BodySourceMap>) = |
| 290 | db.body_with_source_map(self.owner.into()); | 290 | db.body_with_source_map(self.owner.into()); |
| 291 | 291 | ||
| 292 | let match_expr_ty = match infer.type_of_expr.get(match_expr) { | 292 | let match_expr_ty = if infer.type_of_expr[match_expr].is_unknown() { |
| 293 | // If we can't resolve the type of the match expression | 293 | return; |
| 294 | // we cannot perform exhaustiveness checks. | 294 | } else { |
| 295 | None | Some(Ty::Unknown) => return, | 295 | &infer.type_of_expr[match_expr] |
| 296 | Some(ty) => ty, | ||
| 297 | }; | 296 | }; |
| 298 | 297 | ||
| 299 | let cx = MatchCheckCtx { match_expr, body, infer: infer.clone(), db }; | 298 | let cx = MatchCheckCtx { match_expr, body, infer: infer.clone(), db }; |
| @@ -379,14 +378,14 @@ impl<'a, 'b> ExprValidator<'a, 'b> { | |||
| 379 | _ => return, | 378 | _ => return, |
| 380 | }; | 379 | }; |
| 381 | 380 | ||
| 382 | let (params, required) = match mismatch.expected { | 381 | let (params, required) = match mismatch.expected.interned(&Interner) { |
| 383 | Ty::Adt(AdtId(hir_def::AdtId::EnumId(enum_id)), ref parameters) | 382 | TyKind::Adt(AdtId(hir_def::AdtId::EnumId(enum_id)), ref parameters) |
| 384 | if enum_id == core_result_enum => | 383 | if *enum_id == core_result_enum => |
| 385 | { | 384 | { |
| 386 | (parameters, "Ok".to_string()) | 385 | (parameters, "Ok".to_string()) |
| 387 | } | 386 | } |
| 388 | Ty::Adt(AdtId(hir_def::AdtId::EnumId(enum_id)), ref parameters) | 387 | TyKind::Adt(AdtId(hir_def::AdtId::EnumId(enum_id)), ref parameters) |
| 389 | if enum_id == core_option_enum => | 388 | if *enum_id == core_option_enum => |
| 390 | { | 389 | { |
| 391 | (parameters, "Some".to_string()) | 390 | (parameters, "Some".to_string()) |
| 392 | } | 391 | } |