`rustc_mir` -> `rustc_const_eval`

diff --git a/rust-version b/rust-version
index 33be6b9182b898bca20a780fb1d4df0503b05da7..c3b3aed9a426462ab7d6513eb480766c95fcb42b 100644 (file)
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-1c858ba5bf7bd06c1a970efbf77053c8380b3151
+c5cbf7852a7692c7c51df64c09a59e7838b55202

diff --git a/src/bin/miri.rs b/src/bin/miri.rs
index fbc87148ec7b71a5d3571848e3ac1968ef81afa2..36e7f1bfddaad97de9e4bddb5f3b09f3b42602a6 100644 (file)
--- a/src/bin/miri.rs
+++ b/src/bin/miri.rs
@@ -164,11 +164,14 @@ fn init_late_loggers(tcx: TyCtxt<'_>) {
             // used for everything, we only apply it to the parts of rustc that are
             // CTFE-related. Otherwise, we use it verbatim for `RUSTC_LOG`.
             // This way, if you set `MIRI_LOG=trace`, you get only the right parts of
-            // rustc traced, but you can also do `MIRI_LOG=miri=trace,rustc_mir::interpret=debug`.
+            // rustc traced, but you can also do `MIRI_LOG=miri=trace,rustc_const_eval::interpret=debug`.
             if log::Level::from_str(&var).is_ok() {
                 env::set_var(
                     "RUSTC_LOG",
-                    &format!("rustc_middle::mir::interpret={0},rustc_mir::interpret={0}", var),
+                    &format!(
+                        "rustc_middle::mir::interpret={0},rustc_const_eval::interpret={0}",
+                        var
+                    ),
                 );
             } else {
                 env::set_var("RUSTC_LOG", &var);

diff --git a/src/lib.rs b/src/lib.rs
index 7ed915b6d1d4bbda509e632371e7b5bf60c14ac8..c786487d4a146f34b06d203d76246ef1c06961ac 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -11,10 +11,10 @@
 extern crate rustc_ast;
 #[macro_use]
 extern crate rustc_middle;
+extern crate rustc_const_eval;
 extern crate rustc_data_structures;
 extern crate rustc_hir;
 extern crate rustc_index;
-extern crate rustc_mir;
 extern crate rustc_session;
 extern crate rustc_span;
 extern crate rustc_target;
@@ -37,9 +37,9 @@
 // Establish a "crate-wide prelude": we often import `crate::*`.
 
 // Make all those symbols available in the same place as our own.
-pub use rustc_mir::interpret::*;
+pub use rustc_const_eval::interpret::*;
 // Resolve ambiguity.
-pub use rustc_mir::interpret::{self, AllocMap, PlaceTy};
+pub use rustc_const_eval::interpret::{self, AllocMap, PlaceTy};
 
 pub use crate::shims::dlsym::{Dlsym, EvalContextExt as _};
 pub use crate::shims::env::{EnvVars, EvalContextExt as _};

diff --git a/src/machine.rs b/src/machine.rs
index fb39503b538589b95c6409cb8009221142a2c819..23278a4891fb7cf623c31605d2f517e3f8df47a8 100644 (file)
--- a/src/machine.rs
+++ b/src/machine.rs
@@ -457,7 +457,7 @@ fn call_extra_fn(
 
     #[inline(always)]
     fn call_intrinsic(
-        ecx: &mut rustc_mir::interpret::InterpCx<'mir, 'tcx, Self>,
+        ecx: &mut rustc_const_eval::interpret::InterpCx<'mir, 'tcx, Self>,
         instance: ty::Instance<'tcx>,
         args: &[OpTy<'tcx, Tag>],
         ret: Option<(&PlaceTy<'tcx, Tag>, mir::BasicBlock)>,
@@ -482,7 +482,7 @@ fn abort(_ecx: &mut InterpCx<'mir, 'tcx, Self>, msg: String) -> InterpResult<'tc
 
     #[inline(always)]
     fn binary_ptr_op(
-        ecx: &rustc_mir::interpret::InterpCx<'mir, 'tcx, Self>,
+        ecx: &rustc_const_eval::interpret::InterpCx<'mir, 'tcx, Self>,
         bin_op: mir::BinOp,
         left: &ImmTy<'tcx, Tag>,
         right: &ImmTy<'tcx, Tag>,

diff --git a/src/shims/env.rs b/src/shims/env.rs
index 74c0b56e467bbe0acc07558f5a47926cc2754acf..4d297fd935d53f275cf67f8a97104918495a63ac 100644 (file)
--- a/src/shims/env.rs
+++ b/src/shims/env.rs
@@ -3,9 +3,9 @@
 use std::ffi::{OsStr, OsString};
 use std::io::ErrorKind;
 
+use rustc_const_eval::interpret::Pointer;
 use rustc_data_structures::fx::FxHashMap;
 use rustc_middle::ty::layout::LayoutOf;
-use rustc_mir::interpret::Pointer;
 use rustc_target::abi::Size;
 
 use crate::*;