From 8f184b369d6332195ef61f0395cf32bd787e4368 Mon Sep 17 00:00:00 2001
From: Mazdak Farrokhzad <twingoow@gmail.com>
Date: Thu, 29 Aug 2019 08:58:52 +0200
Subject: [PATCH] qualify_consts: misc cleanup.

---
 src/librustc_mir/transform/qualify_consts.rs | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/librustc_mir/transform/qualify_consts.rs b/src/librustc_mir/transform/qualify_consts.rs
index 959d21ecfade..fcbb3433a62d 100644
--- a/src/librustc_mir/transform/qualify_consts.rs
+++ b/src/librustc_mir/transform/qualify_consts.rs
@@ -1714,12 +1714,8 @@ impl<'tcx> MirPass<'tcx> for QualifyAndPromoteConstants<'tcx> {
                         },
                         target,
                         ..
-                    } => {
-                        if promoted_temps.contains(index) {
-                            terminator.kind = TerminatorKind::Goto {
-                                target,
-                            };
-                        }
+                    } if promoted_temps.contains(index) => {
+                        terminator.kind = TerminatorKind::Goto { target };
                     }
                     _ => {}
                 }
@@ -1727,7 +1723,7 @@ impl<'tcx> MirPass<'tcx> for QualifyAndPromoteConstants<'tcx> {
         }
 
         // Statics must be Sync.
-        if mode == Mode::Static {
+        if let Mode::Static = mode {
             // `#[thread_local]` statics don't have to be `Sync`.
             for attr in &tcx.get_attrs(def_id)[..] {
                 if attr.check_name(sym::thread_local) {