From b9569886a915f2411adaecbcad28eda8b163c3e3 Mon Sep 17 00:00:00 2001
From: Paul Daniel Faria <Nashenas88@users.noreply.github.com>
Date: Sun, 24 May 2020 16:28:02 -0400
Subject: Rename Expr::UnsafeBlock to Expr::Unsafe

---
 crates/ra_hir_def/src/body/lower.rs | 2 +-
 crates/ra_hir_def/src/expr.rs       | 4 ++--
 crates/ra_hir_ty/src/expr.rs        | 2 +-
 crates/ra_hir_ty/src/infer/expr.rs  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/crates/ra_hir_def/src/body/lower.rs b/crates/ra_hir_def/src/body/lower.rs
index 174bbf9f4..6eb72e950 100644
--- a/crates/ra_hir_def/src/body/lower.rs
+++ b/crates/ra_hir_def/src/body/lower.rs
@@ -220,7 +220,7 @@ impl ExprCollector<'_> {
                 }
                 ast::Effect::Unsafe(_) => {
                     let body = self.collect_block_opt(e.block_expr());
-                    self.alloc_expr(Expr::UnsafeBlock { body }, syntax_ptr)
+                    self.alloc_expr(Expr::Unsafe { body }, syntax_ptr)
                 }
                 // FIXME: we need to record these effects somewhere...
                 ast::Effect::Async(_) | ast::Effect::Label(_) => {
diff --git a/crates/ra_hir_def/src/expr.rs b/crates/ra_hir_def/src/expr.rs
index f5e3e74fb..e41cfc16b 100644
--- a/crates/ra_hir_def/src/expr.rs
+++ b/crates/ra_hir_def/src/expr.rs
@@ -150,7 +150,7 @@ pub enum Expr {
     Tuple {
         exprs: Vec<ExprId>,
     },
-    UnsafeBlock {
+    Unsafe {
         body: ExprId,
     },
     Array(Array),
@@ -250,7 +250,7 @@ impl Expr {
                     f(*expr);
                 }
             }
-            Expr::TryBlock { body } | Expr::UnsafeBlock { body } => f(*body),
+            Expr::TryBlock { body } | Expr::Unsafe { body } => f(*body),
             Expr::Loop { body, .. } => f(*body),
             Expr::While { condition, body, .. } => {
                 f(*condition);
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(
     let expr_scopes = db.expr_scopes(def);
     for (id, expr) in body.exprs.iter() {
         match expr {
-            Expr::UnsafeBlock { body } => {
+            Expr::Unsafe { body } => {
                 if let Some(scope) = expr_scopes.scope_for(*body) {
                     unsafe_block_scopes.push(scope);
                 }
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> {
                 // FIXME: Breakable block inference
                 self.infer_block(statements, *tail, expected)
             }
-            Expr::UnsafeBlock { body } => self.infer_expr(*body, expected),
+            Expr::Unsafe { body } => self.infer_expr(*body, expected),
             Expr::TryBlock { body } => {
                 let _inner = self.infer_expr(*body, expected);
                 // FIXME should be std::result::Result<{inner}, _>
-- 
cgit v1.2.3