From: David Henningsson <diwic@ubuntu.com>
Date: Thu, 21 Dec 2017 18:32:26 +0000 (+0100)
Subject: Mir: fixup nits in previous commit (f536143)
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=4910ed2b1e12cfb9518ea1e1be0ec144fa0d95a6;p=rust.git

Mir: fixup nits in previous commit (f536143)

As suggested by arielb1.

Closes rust-lang/rust#18510

Signed-off-by: David Henningsson <diwic@ubuntu.com>
---

diff --git a/src/librustc_mir/build/mod.rs b/src/librustc_mir/build/mod.rs
index 4b8ec062a78..2889a05bec5 100644
--- a/src/librustc_mir/build/mod.rs
+++ b/src/librustc_mir/build/mod.rs
@@ -354,10 +354,10 @@ macro_rules! unpack {
     };
 }
 
-fn needs_abort_block<'a, 'gcx, 'tcx>(tcx: TyCtxt<'a, 'gcx, 'tcx>,
-                                     fn_id: ast::NodeId,
-                                     abi: Abi)
-                                     -> bool {
+fn should_abort_on_panic<'a, 'gcx, 'tcx>(tcx: TyCtxt<'a, 'gcx, 'tcx>,
+                                         fn_id: ast::NodeId,
+                                         abi: Abi)
+                                         -> bool {
 
     // Not callable from C, so we can safely unwind through these
     if abi == Abi::Rust || abi == Abi::RustCall { return false; }
@@ -405,8 +405,7 @@ fn construct_fn<'a, 'gcx, 'tcx, A>(hir: Cx<'a, 'gcx, 'tcx>,
     let source_info = builder.source_info(span);
     let call_site_s = (call_site_scope, source_info);
     unpack!(block = builder.in_scope(call_site_s, LintLevel::Inherited, block, |builder| {
-
-        if needs_abort_block(tcx, fn_id, abi) {
+        if should_abort_on_panic(tcx, fn_id, abi) {
             builder.schedule_abort();
         }