@@ -26,7 +26,7 @@ use rustc::util::common::time;
26
26
use rustc:: util:: nodemap:: NodeSet ;
27
27
use rustc_back:: sha2:: { Sha256 , Digest } ;
28
28
use rustc_borrowck as borrowck;
29
- use rustc_incremental:: { self , HashesMap } ;
29
+ use rustc_incremental:: { self , IncrementalHashesMap } ;
30
30
use rustc_resolve:: { MakeGlobMap , Resolver } ;
31
31
use rustc_metadata:: macro_import;
32
32
use rustc_metadata:: creader:: read_local_crates;
@@ -172,7 +172,7 @@ pub fn compile_input(sess: &Session,
172
172
resolutions,
173
173
& arenas,
174
174
& crate_name,
175
- |tcx, mir_map, analysis, hashes_map , result| {
175
+ |tcx, mir_map, analysis, incremental_hashes_map , result| {
176
176
{
177
177
// Eventually, we will want to track plugins.
178
178
let _ignore = tcx. dep_graph . in_ignore ( ) ;
@@ -203,7 +203,7 @@ pub fn compile_input(sess: &Session,
203
203
let trans = phase_4_translate_to_llvm ( tcx,
204
204
mir_map. unwrap ( ) ,
205
205
analysis,
206
- & hashes_map ) ;
206
+ & incremental_hashes_map ) ;
207
207
208
208
if log_enabled ! ( :: log:: INFO ) {
209
209
println ! ( "Post-trans" ) ;
@@ -798,7 +798,7 @@ pub fn phase_3_run_analysis_passes<'tcx, F, R>(sess: &'tcx Session,
798
798
where F : for < ' a > FnOnce ( TyCtxt < ' a , ' tcx , ' tcx > ,
799
799
Option < MirMap < ' tcx > > ,
800
800
ty:: CrateAnalysis ,
801
- HashesMap ,
801
+ IncrementalHashesMap ,
802
802
CompileResult ) -> R
803
803
{
804
804
macro_rules! try_with_f {
@@ -862,16 +862,16 @@ pub fn phase_3_run_analysis_passes<'tcx, F, R>(sess: &'tcx Session,
862
862
index,
863
863
name,
864
864
|tcx| {
865
- let hashes_map =
865
+ let incremental_hashes_map =
866
866
time ( time_passes,
867
- "compute_hashes_map " ,
868
- || rustc_incremental:: compute_hashes_map ( tcx) ) ;
867
+ "compute_incremental_hashes_map " ,
868
+ || rustc_incremental:: compute_incremental_hashes_map ( tcx) ) ;
869
869
time ( time_passes,
870
870
"load_dep_graph" ,
871
- || rustc_incremental:: load_dep_graph ( tcx, & hashes_map ) ) ;
871
+ || rustc_incremental:: load_dep_graph ( tcx, & incremental_hashes_map ) ) ;
872
872
873
873
// passes are timed inside typeck
874
- try_with_f ! ( typeck:: check_crate( tcx) , ( tcx, None , analysis, hashes_map ) ) ;
874
+ try_with_f ! ( typeck:: check_crate( tcx) , ( tcx, None , analysis, incremental_hashes_map ) ) ;
875
875
876
876
time ( time_passes,
877
877
"const checking" ,
@@ -941,7 +941,7 @@ pub fn phase_3_run_analysis_passes<'tcx, F, R>(sess: &'tcx Session,
941
941
// lint warnings and so on -- kindck used to do this abort, but
942
942
// kindck is gone now). -nmatsakis
943
943
if sess. err_count ( ) > 0 {
944
- return Ok ( f ( tcx, Some ( mir_map) , analysis, hashes_map , Err ( sess. err_count ( ) ) ) ) ;
944
+ return Ok ( f ( tcx, Some ( mir_map) , analysis, incremental_hashes_map , Err ( sess. err_count ( ) ) ) ) ;
945
945
}
946
946
947
947
analysis. reachable =
@@ -969,18 +969,18 @@ pub fn phase_3_run_analysis_passes<'tcx, F, R>(sess: &'tcx Session,
969
969
970
970
// The above three passes generate errors w/o aborting
971
971
if sess. err_count ( ) > 0 {
972
- return Ok ( f ( tcx, Some ( mir_map) , analysis, hashes_map , Err ( sess. err_count ( ) ) ) ) ;
972
+ return Ok ( f ( tcx, Some ( mir_map) , analysis, incremental_hashes_map , Err ( sess. err_count ( ) ) ) ) ;
973
973
}
974
974
975
- Ok ( f ( tcx, Some ( mir_map) , analysis, hashes_map , Ok ( ( ) ) ) )
975
+ Ok ( f ( tcx, Some ( mir_map) , analysis, incremental_hashes_map , Ok ( ( ) ) ) )
976
976
} )
977
977
}
978
978
979
979
/// Run the translation phase to LLVM, after which the AST and analysis can
980
980
pub fn phase_4_translate_to_llvm < ' a , ' tcx > ( tcx : TyCtxt < ' a , ' tcx , ' tcx > ,
981
981
mut mir_map : MirMap < ' tcx > ,
982
982
analysis : ty:: CrateAnalysis ,
983
- hashes_map : & HashesMap )
983
+ incremental_hashes_map : & IncrementalHashesMap )
984
984
-> trans:: CrateTranslation {
985
985
let time_passes = tcx. sess . time_passes ( ) ;
986
986
@@ -1014,15 +1014,15 @@ pub fn phase_4_translate_to_llvm<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
1014
1014
let translation =
1015
1015
time ( time_passes,
1016
1016
"translation" ,
1017
- move || trans:: trans_crate ( tcx, & mir_map, analysis, & hashes_map ) ) ;
1017
+ move || trans:: trans_crate ( tcx, & mir_map, analysis, & incremental_hashes_map ) ) ;
1018
1018
1019
1019
time ( time_passes,
1020
1020
"assert dep graph" ,
1021
1021
move || rustc_incremental:: assert_dep_graph ( tcx) ) ;
1022
1022
1023
1023
time ( time_passes,
1024
1024
"serialize dep graph" ,
1025
- move || rustc_incremental:: save_dep_graph ( tcx, & hashes_map ) ) ;
1025
+ move || rustc_incremental:: save_dep_graph ( tcx, & incremental_hashes_map ) ) ;
1026
1026
1027
1027
translation
1028
1028
}
0 commit comments