11
11
//! `optimized_mir` and pulls out the MIR bodies with the borrowck information
12
12
//! from the thread local storage.
13
13
14
+ extern crate rustc_borrowck;
14
15
extern crate rustc_driver;
15
16
extern crate rustc_hir;
16
17
extern crate rustc_interface;
17
18
extern crate rustc_middle;
18
- extern crate rustc_mir;
19
19
extern crate rustc_session;
20
20
21
+ use rustc_borrowck:: consumers:: BodyWithBorrowckFacts ;
21
22
use rustc_driver:: Compilation ;
22
23
use rustc_hir:: def_id:: LocalDefId ;
23
24
use rustc_hir:: itemlikevisit:: ItemLikeVisitor ;
@@ -26,7 +27,6 @@ use rustc_interface::{Config, Queries};
26
27
use rustc_middle:: ty:: query:: query_values:: mir_borrowck;
27
28
use rustc_middle:: ty:: query:: Providers ;
28
29
use rustc_middle:: ty:: { self , TyCtxt } ;
29
- use rustc_mir:: consumers:: BodyWithBorrowckFacts ;
30
30
use rustc_session:: Session ;
31
31
use std:: cell:: RefCell ;
32
32
use std:: collections:: HashMap ;
@@ -108,7 +108,7 @@ thread_local! {
108
108
}
109
109
110
110
fn mir_borrowck < ' tcx > ( tcx : TyCtxt < ' tcx > , def_id : LocalDefId ) -> mir_borrowck < ' tcx > {
111
- let body_with_facts = rustc_mir :: consumers:: get_body_with_borrowck_facts (
111
+ let body_with_facts = rustc_borrowck :: consumers:: get_body_with_borrowck_facts (
112
112
tcx,
113
113
ty:: WithOptConstParam :: unknown ( def_id) ,
114
114
) ;
@@ -120,7 +120,7 @@ fn mir_borrowck<'tcx>(tcx: TyCtxt<'tcx>, def_id: LocalDefId) -> mir_borrowck<'tc
120
120
assert ! ( map. insert( def_id, body_with_facts) . is_none( ) ) ;
121
121
} ) ;
122
122
let mut providers = Providers :: default ( ) ;
123
- rustc_mir :: provide ( & mut providers) ;
123
+ rustc_borrowck :: provide ( & mut providers) ;
124
124
let original_mir_borrowck = providers. mir_borrowck ;
125
125
original_mir_borrowck ( tcx, def_id)
126
126
}
0 commit comments