qualify_consts: misc cleanup.

Centril · Centril · commit 8f184b369d63 · 2019-08-31T02:45:51.000+02:00
diff --git a/src/librustc_mir/transform/qualify_consts.rs b/src/librustc_mir/transform/qualify_consts.rs
@@ -1714,20 +1714,16 @@ 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 };
                     }
                     _ => {}
                 }
             }
         }
 
         // 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) {

Original file line number	Diff line number	Diff line change
`@@ -1714,20 +1714,16 @@ impl<'tcx> MirPass<'tcx> for QualifyAndPromoteConstants<'tcx> {`
`1714`	`1714`	`},`
`1715`	`1715`	`target,`
`1716`	`1716`	`..`
`1717`		`- } => {`
`1718`		`- if promoted_temps.contains(index) {`
`1719`		`- terminator.kind = TerminatorKind::Goto {`
`1720`		`- target,`
`1721`		`- };`
`1722`		`- }`
	`1717`	`+ } if promoted_temps.contains(index) => {`
	`1718`	`+ terminator.kind = TerminatorKind::Goto { target };`
`1723`	`1719`	`}`
`1724`	`1720`	`_ => {}`
`1725`	`1721`	`}`
`1726`	`1722`	`}`
`1727`	`1723`	`}`
`1728`	`1724`
`1729`	`1725`	`// Statics must be Sync.`
`1730`		`- if mode == Mode::Static {`
	`1726`	`+ if let Mode::Static = mode {`
`1731`	`1727`	// `#[thread_local]` statics don't have to be `Sync`.
`1732`	`1728`	`for attr in &tcx.get_attrs(def_id)[..] {`
`1733`	`1729`	`if attr.check_name(sym::thread_local) {`