From 03d38d42b7dd890744aecce0a008d25e34c95048 Mon Sep 17 00:00:00 2001
From: Oliver Scherer <github35764891676564198441@oli-obk.de>
Date: Tue, 18 Aug 2020 13:44:57 +0200
Subject: [PATCH] Address review comments

---
 src/librustc_middle/mir/mod.rs           | 2 +-
 src/librustc_mir/interpret/intern.rs     | 2 +-
 src/librustc_mir/transform/const_prop.rs | 2 +-
 src/librustc_mir/transform/mod.rs        | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/librustc_middle/mir/mod.rs b/src/librustc_middle/mir/mod.rs
index 22828994934..45b39c2fb67 100644
--- a/src/librustc_middle/mir/mod.rs
+++ b/src/librustc_middle/mir/mod.rs
@@ -101,7 +101,7 @@ pub enum MirPhase {
     /// After this phase, generators are explicit state machines (no more `Yield`).
     /// `AggregateKind::Generator` is gone for good.
     GeneratorLowering = 4,
-    Optimized = 5,
+    Optimization = 5,
 }
 
 impl MirPhase {
diff --git a/src/librustc_mir/interpret/intern.rs b/src/librustc_mir/interpret/intern.rs
index 6ba5a18da05..606be7cad2b 100644
--- a/src/librustc_mir/interpret/intern.rs
+++ b/src/librustc_mir/interpret/intern.rs
@@ -436,7 +436,7 @@ impl<'mir, 'tcx: 'mir, M: super::intern::CompileTimeMachine<'mir, 'tcx>> InterpC
     /// A helper function that allocates memory for the layout given and gives you access to mutate
     /// it. Once your own mutation code is done, the backing `Allocation` is removed from the
     /// current `Memory` and returned.
-    pub(crate) fn with_temp_alloc(
+    pub(crate) fn intern_with_temp_alloc(
         &mut self,
         layout: TyAndLayout<'tcx>,
         f: impl FnOnce(
diff --git a/src/librustc_mir/transform/const_prop.rs b/src/librustc_mir/transform/const_prop.rs
index 40b1bfc7a95..7b4582abe5e 100644
--- a/src/librustc_mir/transform/const_prop.rs
+++ b/src/librustc_mir/transform/const_prop.rs
@@ -845,7 +845,7 @@ fn replace_with_const(
                                 if ty_is_scalar(ty1) && ty_is_scalar(ty2) {
                                     let alloc = this
                                         .ecx
-                                        .with_temp_alloc(value.layout, |ecx, dest| {
+                                        .intern_with_temp_alloc(value.layout, |ecx, dest| {
                                             ecx.write_immediate_to_mplace(*imm, dest)
                                         })
                                         .unwrap();
diff --git a/src/librustc_mir/transform/mod.rs b/src/librustc_mir/transform/mod.rs
index 3f13dc0476a..06114a6aeaf 100644
--- a/src/librustc_mir/transform/mod.rs
+++ b/src/librustc_mir/transform/mod.rs
@@ -228,7 +228,7 @@ pub fn run_passes(
 
     body.phase = mir_phase;
 
-    if mir_phase == MirPhase::Optimized {
+    if mir_phase == MirPhase::Optimization {
         validate::Validator { when: format!("end of phase {:?}", mir_phase), mir_phase }
             .run_pass(tcx, source, body);
     }
@@ -504,7 +504,7 @@ fn run_optimization_passes<'tcx>(
         body,
         InstanceDef::Item(ty::WithOptConstParam::unknown(def_id.to_def_id())),
         promoted,
-        MirPhase::Optimized,
+        MirPhase::Optimization,
         &[
             if mir_opt_level > 0 { optimizations } else { no_optimizations },
             pre_codegen_cleanup,
-- 
GitLab