diff options
Diffstat (limited to 'crates/ra_hir/src/ty.rs')
-rw-r--r-- | crates/ra_hir/src/ty.rs | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/crates/ra_hir/src/ty.rs b/crates/ra_hir/src/ty.rs index 0472414a6..60c231e82 100644 --- a/crates/ra_hir/src/ty.rs +++ b/crates/ra_hir/src/ty.rs | |||
@@ -1488,7 +1488,9 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> { | |||
1488 | for &pat in &arm.pats { | 1488 | for &pat in &arm.pats { |
1489 | let _pat_ty = self.infer_pat(pat, &input_ty); | 1489 | let _pat_ty = self.infer_pat(pat, &input_ty); |
1490 | } | 1490 | } |
1491 | // TODO type the guard | 1491 | if let Some(guard_expr) = arm.guard { |
1492 | self.infer_expr(guard_expr, &Expectation::has_type(Ty::Bool)); | ||
1493 | } | ||
1492 | self.infer_expr(arm.expr, &expected); | 1494 | self.infer_expr(arm.expr, &expected); |
1493 | } | 1495 | } |
1494 | 1496 | ||
@@ -1561,9 +1563,17 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> { | |||
1561 | cast_ty | 1563 | cast_ty |
1562 | } | 1564 | } |
1563 | Expr::Ref { expr, mutability } => { | 1565 | Expr::Ref { expr, mutability } => { |
1564 | // TODO pass the expectation down | 1566 | let expectation = if let Ty::Ref(ref subty, expected_mutability) = expected.ty { |
1565 | let inner_ty = self.infer_expr(*expr, &Expectation::none()); | 1567 | if expected_mutability == Mutability::Mut && *mutability == Mutability::Shared { |
1568 | // TODO: throw type error - expected mut reference but found shared ref, | ||
1569 | // which cannot be coerced | ||
1570 | } | ||
1571 | Expectation::has_type((**subty).clone()) | ||
1572 | } else { | ||
1573 | Expectation::none() | ||
1574 | }; | ||
1566 | // TODO reference coercions etc. | 1575 | // TODO reference coercions etc. |
1576 | let inner_ty = self.infer_expr(*expr, &expectation); | ||
1567 | Ty::Ref(Arc::new(inner_ty), *mutability) | 1577 | Ty::Ref(Arc::new(inner_ty), *mutability) |
1568 | } | 1578 | } |
1569 | Expr::UnaryOp { expr, op } => { | 1579 | Expr::UnaryOp { expr, op } => { |