don't lazily evaulate some trivial values for Option::None replacements (clippy::unnecessary_lazy_evaluations)

2020-09-15 23:10:24 +02:00
parent f567287f9f
commit 0e3414248a
3 changed files with 4 additions and 7 deletions
--- a/compiler/rustc_mir/src/dataflow/move_paths/builder.rs
+++ b/compiler/rustc_mir/src/dataflow/move_paths/builder.rs
@@ -480,10 +480,7 @@ impl<'b, 'a, 'tcx> Gatherer<'b, 'a, 'tcx> {
            };
            let base_ty = base_place.ty(self.builder.body, self.builder.tcx).ty;
            let len: u64 = match base_ty.kind() {
-                ty::Array(_, size) => {
-                    let length: u64 = size.eval_usize(self.builder.tcx, self.builder.param_env);
-                    length
-                }
+                ty::Array(_, size) => size.eval_usize(self.builder.tcx, self.builder.param_env),
                _ => bug!("from_end: false slice pattern of non-array type"),
            };
            for offset in from..to {