diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-12-23 19:50:04 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-12-23 19:50:04 +0000 |
| commit | a82c2445be5fbd9ef6ff8a60326d60ae97c122bb (patch) | |
| tree | 8877d4fd3916b28a801a6fa247640138636f72d9 /crates/hir_ty/src/infer/expr.rs | |
| parent | 01a3fd960089d562dac328221c93875cabad1d51 (diff) | |
| parent | a142beaf013a016a48eb9f193b55e0cbcb80b6a9 (diff) | |
Merge #7020
7020: Implement const pat and expr inference r=flodiebold a=Veykril
Co-authored-by: Lukas Wirth <[email protected]>
Diffstat (limited to 'crates/hir_ty/src/infer/expr.rs')
| -rw-r--r-- | crates/hir_ty/src/infer/expr.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/hir_ty/src/infer/expr.rs b/crates/hir_ty/src/infer/expr.rs index 2cdce2cef..744569e6e 100644 --- a/crates/hir_ty/src/infer/expr.rs +++ b/crates/hir_ty/src/infer/expr.rs | |||
| @@ -155,7 +155,7 @@ impl<'a> InferenceContext<'a> { | |||
| 155 | } | 155 | } |
| 156 | None => self.infer_block(statements, *tail, expected), | 156 | None => self.infer_block(statements, *tail, expected), |
| 157 | }, | 157 | }, |
| 158 | Expr::Unsafe { body } => self.infer_expr(*body, expected), | 158 | Expr::Unsafe { body } | Expr::Const { body } => self.infer_expr(*body, expected), |
| 159 | Expr::TryBlock { body } => { | 159 | Expr::TryBlock { body } => { |
| 160 | let _inner = self.infer_expr(*body, expected); | 160 | let _inner = self.infer_expr(*body, expected); |
| 161 | // FIXME should be std::result::Result<{inner}, _> | 161 | // FIXME should be std::result::Result<{inner}, _> |