Rename rustc_mir to rustc_const_eval.

Author: cjgillot

Cargo.lock

@@ -3605,6 +3605,7 @@ dependencies = [
  "either",
  "itertools 0.9.0",
  "polonius-engine",
+ "rustc_const_eval",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_graphviz",
@@ -3613,7 +3614,6 @@ dependencies = [
  "rustc_infer",
  "rustc_lexer",
  "rustc_middle",
- "rustc_mir",
  "rustc_mir_dataflow",
  "rustc_serialize",
  "rustc_session",
@@ -3708,6 +3708,30 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "rustc_const_eval"
+version = "0.0.0"
+dependencies = [
+ "either",
+ "gsgdt",
+ "rustc_apfloat",
+ "rustc_ast",
+ "rustc_attr",
+ "rustc_data_structures",
+ "rustc_errors",
+ "rustc_hir",
+ "rustc_index",
+ "rustc_infer",
+ "rustc_macros",
+ "rustc_middle",
+ "rustc_mir_dataflow",
+ "rustc_session",
+ "rustc_span",
+ "rustc_target",
+ "rustc_trait_selection",
+ "tracing",
+]
+
 [[package]]
 name = "rustc_data_structures"
 version = "0.0.0"
@@ -3746,6 +3770,7 @@ dependencies = [
  "rustc_ast",
  "rustc_ast_pretty",
  "rustc_codegen_ssa",
+ "rustc_const_eval",
  "rustc_data_structures",
  "rustc_error_codes",
  "rustc_errors",
@@ -3756,7 +3781,6 @@ dependencies = [
  "rustc_lint",
  "rustc_metadata",
  "rustc_middle",
- "rustc_mir",
  "rustc_parse",
  "rustc_plugin_impl",
  "rustc_save_analysis",
@@ -3919,6 +3943,7 @@ dependencies = [
  "rustc_builtin_macros",
  "rustc_codegen_llvm",
  "rustc_codegen_ssa",
+ "rustc_const_eval",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_expand",
@@ -3927,7 +3952,6 @@ dependencies = [
  "rustc_lint",
  "rustc_metadata",
  "rustc_middle",
- "rustc_mir",
  "rustc_mir_build",
  "rustc_mir_transform",
  "rustc_monomorphize",
@@ -4073,30 +4097,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "rustc_mir"
-version = "0.0.0"
-dependencies = [
- "either",
- "gsgdt",
- "rustc_apfloat",
- "rustc_ast",
- "rustc_attr",
- "rustc_data_structures",
- "rustc_errors",
- "rustc_hir",
- "rustc_index",
- "rustc_infer",
- "rustc_macros",
- "rustc_middle",
- "rustc_mir_dataflow",
- "rustc_session",
- "rustc_span",
- "rustc_target",
- "rustc_trait_selection",
- "tracing",
-]
-
 [[package]]
 name = "rustc_mir_build"
 version = "0.0.0"
@@ -4148,12 +4148,12 @@ dependencies = [
  "itertools 0.9.0",
  "rustc_ast",
  "rustc_attr",
+ "rustc_const_eval",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_hir",
  "rustc_index",
  "rustc_middle",
- "rustc_mir",
  "rustc_mir_dataflow",
  "rustc_serialize",
  "rustc_session",

compiler/rustc_borrowck/Cargo.toml

@@ -21,7 +21,7 @@ rustc_index = { path = "../rustc_index" }
 rustc_infer = { path = "../rustc_infer" }
 rustc_lexer = { path = "../rustc_lexer" }
 rustc_middle = { path = "../rustc_middle" }
-rustc_mir = { path = "../rustc_mir" }
+rustc_const_eval = { path = "../rustc_const_eval" }
 rustc_mir_dataflow = { path = "../rustc_mir_dataflow" }
 rustc_serialize = { path = "../rustc_serialize" }
 rustc_session = { path = "../rustc_session" }

compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs

@@ -1695,7 +1695,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
             Some((method_did, method_substs)),
         ) = (
             &self.body[loan.reserve_location.block].terminator,
-            rustc_mir::util::find_self_call(
+            rustc_const_eval::util::find_self_call(
                 tcx,
                 self.body,
                 loan.assigned_place.local,

compiler/rustc_borrowck/src/diagnostics/mod.rs

@@ -899,12 +899,13 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
             kind: TerminatorKind::Call { fn_span, from_hir_call, .. }, ..
         }) = &self.body[location.block].terminator
         {
-            let (method_did, method_substs) = if let Some(info) = rustc_mir::util::find_self_call(
-                self.infcx.tcx,
-                &self.body,
-                target_temp,
-                location.block,
-            ) {
+            let (method_did, method_substs) = if let Some(info) =
+                rustc_const_eval::util::find_self_call(
+                    self.infcx.tcx,
+                    &self.body,
+                    target_temp,
+                    location.block,
+                ) {
                 info
             } else {
                 return normal_ret;

compiler/rustc_borrowck/src/diagnostics/mutability_errors.rs

@@ -16,8 +16,8 @@ use rustc_span::{BytePos, Span};
 
 use crate::diagnostics::BorrowedContentSource;
 use crate::MirBorrowckCtxt;
+use rustc_const_eval::util::collect_writes::FindAssignments;
 use rustc_errors::{Applicability, DiagnosticBuilder};
-use rustc_mir::util::collect_writes::FindAssignments;
 
 #[derive(Copy, Clone, Debug, Eq, PartialEq)]
 pub(crate) enum AccessKind {

compiler/rustc_borrowck/src/type_check/mod.rs

@@ -41,7 +41,7 @@ use rustc_trait_selection::traits::query::type_op::custom::CustomTypeOp;
 use rustc_trait_selection::traits::query::Fallible;
 use rustc_trait_selection::traits::{self, ObligationCause, PredicateObligations};
 
-use rustc_mir::transform::{
+use rustc_const_eval::transform::{
     check_consts::ConstCx, promote_consts::is_const_fn_in_array_repeat_expression,
 };
 use rustc_mir_dataflow::impls::MaybeInitializedPlaces;

compiler/rustc_mir/Cargo.toml renamed to compiler/rustc_const_eval/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "rustc_mir"
+name = "rustc_const_eval"
 version = "0.0.0"
 edition = "2018"