about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2021-09-08 20:42:42 +0000
committerbors <bors@rust-lang.org>2021-09-08 20:42:42 +0000
commit97032a6dfacdd3548e4bff98c90a6b3875a14077 (patch)
tree9b89fe6f913eeacc4e7e5c93c9534a6e87cd538f /src/test
parent47ae8deb8a35030bdc4e502b03400800864cc264 (diff)
parent924dbc36c9888eebacdcd06ec444418683b0d5fd (diff)
Auto merge of #80522 - cjgillot:borrowcrate, r=oli-obk
Split rustc_mir

The `rustc_mir` crate is the second largest in the compiler.
This PR splits it up into 5 crates:
- rustc_borrowck;
- rustc_const_eval;
- rustc_mir_dataflow;
- rustc_mir_transform;
- rustc_monomorphize.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/run-make-fulldeps/obtain-borrowck/driver.rs8
-rw-r--r--src/test/run-make-fulldeps/sepcomp-cci-copies/Makefile2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/test/run-make-fulldeps/obtain-borrowck/driver.rs b/src/test/run-make-fulldeps/obtain-borrowck/driver.rs
index 308df0b030c..961ea518c13 100644
--- a/src/test/run-make-fulldeps/obtain-borrowck/driver.rs
+++ b/src/test/run-make-fulldeps/obtain-borrowck/driver.rs
@@ -11,13 +11,14 @@
 //! `optimized_mir` and pulls out the MIR bodies with the borrowck information
 //! from the thread local storage.
 
+extern crate rustc_borrowck;
 extern crate rustc_driver;
 extern crate rustc_hir;
 extern crate rustc_interface;
 extern crate rustc_middle;
-extern crate rustc_mir;
 extern crate rustc_session;
 
+use rustc_borrowck::consumers::BodyWithBorrowckFacts;
 use rustc_driver::Compilation;
 use rustc_hir::def_id::LocalDefId;
 use rustc_hir::itemlikevisit::ItemLikeVisitor;
@@ -26,7 +27,6 @@ use rustc_interface::{Config, Queries};
 use rustc_middle::ty::query::query_values::mir_borrowck;
 use rustc_middle::ty::query::Providers;
 use rustc_middle::ty::{self, TyCtxt};
-use rustc_mir::consumers::BodyWithBorrowckFacts;
 use rustc_session::Session;
 use std::cell::RefCell;
 use std::collections::HashMap;
@@ -108,7 +108,7 @@ thread_local! {
 }
 
 fn mir_borrowck<'tcx>(tcx: TyCtxt<'tcx>, def_id: LocalDefId) -> mir_borrowck<'tcx> {
-    let body_with_facts = rustc_mir::consumers::get_body_with_borrowck_facts(
+    let body_with_facts = rustc_borrowck::consumers::get_body_with_borrowck_facts(
         tcx,
         ty::WithOptConstParam::unknown(def_id),
     );
@@ -120,7 +120,7 @@ fn mir_borrowck<'tcx>(tcx: TyCtxt<'tcx>, def_id: LocalDefId) -> mir_borrowck<'tc
         assert!(map.insert(def_id, body_with_facts).is_none());
     });
     let mut providers = Providers::default();
-    rustc_mir::provide(&mut providers);
+    rustc_borrowck::provide(&mut providers);
     let original_mir_borrowck = providers.mir_borrowck;
     original_mir_borrowck(tcx, def_id)
 }
diff --git a/src/test/run-make-fulldeps/sepcomp-cci-copies/Makefile b/src/test/run-make-fulldeps/sepcomp-cci-copies/Makefile
index 36f913ff3fa..77d1d71e9b2 100644
--- a/src/test/run-make-fulldeps/sepcomp-cci-copies/Makefile
+++ b/src/test/run-make-fulldeps/sepcomp-cci-copies/Makefile
@@ -3,7 +3,7 @@
 # Check that cross-crate inlined items are inlined in all compilation units
 # that refer to them, and not in any other compilation units.
 # Note that we have to pass `-C codegen-units=6` because up to two CGUs may be
-# created for each source module (see `rustc_mir::monomorphize::partitioning`).
+# created for each source module (see `rustc_const_eval::monomorphize::partitioning`).
 
 all:
 	$(RUSTC) cci_lib.rs