@@ -88,7 +88,7 @@ pub fn compile_input(sess: &Session,
88
88
// We need nested scopes here, because the intermediate results can keep
89
89
// large chunks of memory alive and we want to free them as soon as
90
90
// possible to keep the peak memory usage low
91
- let ( outputs, trans, id ) = {
91
+ let ( outputs, trans, crate_name ) = {
92
92
let krate = match phase_1_parse_input ( sess, cfg, input) {
93
93
Ok ( krate) => krate,
94
94
Err ( mut parse_error) => {
@@ -113,21 +113,21 @@ pub fn compile_input(sess: &Session,
113
113
} ;
114
114
115
115
let outputs = build_output_filenames ( input, outdir, output, & krate. attrs , sess) ;
116
- let id = link:: find_crate_name ( Some ( sess) , & krate. attrs , input) ;
116
+ let crate_name = link:: find_crate_name ( Some ( sess) , & krate. attrs , input) ;
117
117
let ExpansionResult { expanded_crate, defs, analysis, resolutions, mut hir_forest } = {
118
118
phase_2_configure_and_expand (
119
- sess, & cstore, krate, & id , addl_plugins, control. make_glob_map ,
119
+ sess, & cstore, krate, & crate_name , addl_plugins, control. make_glob_map ,
120
120
|expanded_crate| {
121
121
let mut state = CompileState :: state_after_expand (
122
- input, sess, outdir, output, & cstore, expanded_crate, & id ,
122
+ input, sess, outdir, output, & cstore, expanded_crate, & crate_name ,
123
123
) ;
124
124
controller_entry_point ! ( after_expand, sess, state, Ok ( ( ) ) ) ;
125
125
Ok ( ( ) )
126
126
}
127
127
) ?
128
128
} ;
129
129
130
- write_out_deps ( sess, & outputs, & id ) ;
130
+ write_out_deps ( sess, & outputs, & crate_name ) ;
131
131
132
132
let arenas = ty:: CtxtArenas :: new ( ) ;
133
133
@@ -151,7 +151,7 @@ pub fn compile_input(sess: &Session,
151
151
& resolutions,
152
152
& expanded_crate,
153
153
& hir_map. krate( ) ,
154
- & id ) ,
154
+ & crate_name ) ,
155
155
Ok ( ( ) ) ) ;
156
156
}
157
157
@@ -171,7 +171,7 @@ pub fn compile_input(sess: &Session,
171
171
analysis,
172
172
resolutions,
173
173
& arenas,
174
- & id ,
174
+ & crate_name ,
175
175
|tcx, mir_map, analysis, result| {
176
176
{
177
177
// Eventually, we will want to track plugins.
@@ -186,7 +186,7 @@ pub fn compile_input(sess: &Session,
186
186
& analysis,
187
187
mir_map. as_ref ( ) ,
188
188
tcx,
189
- & id ) ;
189
+ & crate_name ) ;
190
190
( control. after_analysis . callback ) ( & mut state) ;
191
191
192
192
if control. after_analysis . stop == Compilation :: Stop {
@@ -212,11 +212,11 @@ pub fn compile_input(sess: &Session,
212
212
// Discard interned strings as they are no longer required.
213
213
token:: clear_ident_interner ( ) ;
214
214
215
- Ok ( ( outputs, trans, id . clone ( ) ) )
215
+ Ok ( ( outputs, trans, crate_name . clone ( ) ) )
216
216
} ) ??
217
217
} ;
218
218
219
- let phase5_result = phase_5_run_llvm_passes ( sess, & id , & trans, & outputs) ;
219
+ let phase5_result = phase_5_run_llvm_passes ( sess, & crate_name , & trans, & outputs) ;
220
220
221
221
controller_entry_point ! ( after_llvm,
222
222
sess,
@@ -1069,14 +1069,14 @@ fn escape_dep_filename(filename: &str) -> String {
1069
1069
filename. replace ( " " , "\\ " )
1070
1070
}
1071
1071
1072
- fn write_out_deps ( sess : & Session , outputs : & OutputFilenames , id : & str ) {
1072
+ fn write_out_deps ( sess : & Session , outputs : & OutputFilenames , crate_name : & str ) {
1073
1073
let mut out_filenames = Vec :: new ( ) ;
1074
1074
for output_type in sess. opts . output_types . keys ( ) {
1075
1075
let file = outputs. path ( * output_type) ;
1076
1076
match * output_type {
1077
1077
OutputType :: Exe => {
1078
1078
for output in sess. crate_types . borrow ( ) . iter ( ) {
1079
- let p = link:: filename_for_input ( sess, * output, id , outputs) ;
1079
+ let p = link:: filename_for_input ( sess, * output, crate_name , outputs) ;
1080
1080
out_filenames. push ( p) ;
1081
1081
}
1082
1082
}
0 commit comments