Undo a few - now unnecessary - changes

Author: oli-obk

src/librustc_mir/hair/pattern/_match.rs

@@ -1752,8 +1752,7 @@ fn specialize<'p, 'a: 'p, 'tcx: 'a>(
                     // they should be pointing to memory is when they are subslices of nonzero
                     // slices
                     let (opt_ptr, n, ty) = match value.ty.builtin_deref(false).unwrap().ty.sty {
-                        ty::TyKind::Array(t, n) =>
-                            (value.to_ptr(), n.unwrap_usize(cx.tcx), t),
+                        ty::TyKind::Array(t, n) => (value.to_ptr(), n.unwrap_usize(cx.tcx), t),
                         ty::TyKind::Slice(t) => {
                             match value.val {
                                 ConstValue::ScalarPair(ptr, n) => (

src/librustc_mir/transform/qualify_consts.rs

@@ -712,8 +712,7 @@ impl<'a, 'tcx> Visitor<'tcx> for Qualifier<'a, 'tcx, 'tcx> {
                     } else if let ty::Array(_, len) = ty.sty {
                         // FIXME(eddyb) the `self.mode == Mode::Fn` condition
                         // seems unnecessary, given that this is merely a ZST.
-                        let len = len.unwrap_usize(self.tcx);
-                        if len == 0 && self.mode == Mode::Fn {
+                        if len.unwrap_usize(self.tcx) == 0 && self.mode == Mode::Fn {
                             forbidden_mut = false;
                         }
                     }