aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir_ty
diff options
context:
space:
mode:
authorPaul Daniel Faria <[email protected]>2020-05-24 21:28:02 +0100
committerPaul Daniel Faria <[email protected]>2020-06-27 15:10:26 +0100
commitb9569886a915f2411adaecbcad28eda8b163c3e3 (patch)
tree291b5a8e121b261fc5c4a3ca3d71feee01befcc9 /crates/ra_hir_ty
parent278cbf12cd0f76fc191d5ce7f130e6245596a578 (diff)
Rename Expr::UnsafeBlock to Expr::Unsafe
Diffstat (limited to 'crates/ra_hir_ty')
-rw-r--r--crates/ra_hir_ty/src/expr.rs2
-rw-r--r--crates/ra_hir_ty/src/infer/expr.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir_ty/src/expr.rs b/crates/ra_hir_ty/src/expr.rs
index d600aca21..ce73251b8 100644
--- a/crates/ra_hir_ty/src/expr.rs
+++ b/crates/ra_hir_ty/src/expr.rs
@@ -340,7 +340,7 @@ pub fn unsafe_expressions(
340 let expr_scopes = db.expr_scopes(def); 340 let expr_scopes = db.expr_scopes(def);
341 for (id, expr) in body.exprs.iter() { 341 for (id, expr) in body.exprs.iter() {
342 match expr { 342 match expr {
343 Expr::UnsafeBlock { body } => { 343 Expr::Unsafe { body } => {
344 if let Some(scope) = expr_scopes.scope_for(*body) { 344 if let Some(scope) = expr_scopes.scope_for(*body) {
345 unsafe_block_scopes.push(scope); 345 unsafe_block_scopes.push(scope);
346 } 346 }
diff --git a/crates/ra_hir_ty/src/infer/expr.rs b/crates/ra_hir_ty/src/infer/expr.rs
index df7bcb5fa..61af5f064 100644
--- a/crates/ra_hir_ty/src/infer/expr.rs
+++ b/crates/ra_hir_ty/src/infer/expr.rs
@@ -142,7 +142,7 @@ impl<'a> InferenceContext<'a> {
142 // FIXME: Breakable block inference 142 // FIXME: Breakable block inference
143 self.infer_block(statements, *tail, expected) 143 self.infer_block(statements, *tail, expected)
144 } 144 }
145 Expr::UnsafeBlock { body } => self.infer_expr(*body, expected), 145 Expr::Unsafe { body } => self.infer_expr(*body, expected),
146 Expr::TryBlock { body } => { 146 Expr::TryBlock { body } => {
147 let _inner = self.infer_expr(*body, expected); 147 let _inner = self.infer_expr(*body, expected);
148 // FIXME should be std::result::Result<{inner}, _> 148 // FIXME should be std::result::Result<{inner}, _>