Skip to content

Commit 45c5169

Browse files
committed
Rename Linker::prepare_outputs as output_filenames.
It matches the type, and a noun makes more sense than a verb. The `output_filenames` function still uses a profiling label named `prepare_outputs`, but I think that makes sense as a verb and can be left unchanged.
1 parent 980e359 commit 45c5169

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

compiler/rustc_interface/src/queries.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ impl<'tcx> Queries<'tcx> {
243243
self.global_ctxt()?.enter(|tcx| {
244244
Ok(Linker {
245245
dep_graph: tcx.dep_graph.clone(),
246-
prepare_outputs: tcx.output_filenames(()).clone(),
246+
output_filenames: tcx.output_filenames(()).clone(),
247247
crate_hash: if tcx.needs_crate_hash() {
248248
Some(tcx.crate_hash(LOCAL_CRATE))
249249
} else {
@@ -257,7 +257,7 @@ impl<'tcx> Queries<'tcx> {
257257

258258
pub struct Linker {
259259
dep_graph: DepGraph,
260-
prepare_outputs: Arc<OutputFilenames>,
260+
output_filenames: Arc<OutputFilenames>,
261261
// Only present when incr. comp. is enabled.
262262
crate_hash: Option<Svh>,
263263
ongoing_codegen: Box<dyn Any>,
@@ -266,7 +266,7 @@ pub struct Linker {
266266
impl Linker {
267267
pub fn link(self, sess: &Session, codegen_backend: &dyn CodegenBackend) -> Result<()> {
268268
let (codegen_results, work_products) =
269-
codegen_backend.join_codegen(self.ongoing_codegen, sess, &self.prepare_outputs)?;
269+
codegen_backend.join_codegen(self.ongoing_codegen, sess, &self.output_filenames)?;
270270

271271
sess.compile_status()?;
272272

@@ -292,14 +292,14 @@ impl Linker {
292292
}
293293

294294
if sess.opts.unstable_opts.no_link {
295-
let rlink_file = self.prepare_outputs.with_extension(config::RLINK_EXT);
295+
let rlink_file = self.output_filenames.with_extension(config::RLINK_EXT);
296296
CodegenResults::serialize_rlink(sess, &rlink_file, &codegen_results)
297297
.map_err(|error| sess.emit_fatal(FailedWritingFile { path: &rlink_file, error }))?;
298298
return Ok(());
299299
}
300300

301301
let _timer = sess.prof.verbose_generic_activity("link_crate");
302-
codegen_backend.link(sess, codegen_results, &self.prepare_outputs)
302+
codegen_backend.link(sess, codegen_results, &self.output_filenames)
303303
}
304304
}
305305

0 commit comments

Comments
 (0)