diff options
| author | Nicholas Nethercote <n.nethercote@gmail.com> | 2023-11-17 09:04:45 +1100 |
|---|---|---|
| committer | Nicholas Nethercote <n.nethercote@gmail.com> | 2023-11-17 17:30:38 +1100 |
| commit | 94c9075b278660c72031b7b34f19f0f9e6b7f2e5 (patch) | |
| tree | f21e670ca23f5bd79b903e99ee1947844a79ed40 | |
| parent | aed8e1f3b635c379d03007b86cff4dd36cb49eb4 (diff) | |
| download | rust-94c9075b278660c72031b7b34f19f0f9e6b7f2e5.tar.gz rust-94c9075b278660c72031b7b34f19f0f9e6b7f2e5.zip | |
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.
| -rw-r--r-- | compiler/rustc_interface/src/queries.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/compiler/rustc_interface/src/queries.rs b/compiler/rustc_interface/src/queries.rs index a3161be0c3d..7d31fd8cb5c 100644 --- a/compiler/rustc_interface/src/queries.rs +++ b/compiler/rustc_interface/src/queries.rs @@ -240,7 +240,7 @@ impl<'tcx> Queries<'tcx> { self.global_ctxt()?.enter(|tcx| { Ok(Linker { dep_graph: tcx.dep_graph.clone(), - prepare_outputs: tcx.output_filenames(()).clone(), + output_filenames: tcx.output_filenames(()).clone(), crate_hash: if tcx.needs_crate_hash() { Some(tcx.crate_hash(LOCAL_CRATE)) } else { @@ -254,7 +254,7 @@ impl<'tcx> Queries<'tcx> { pub struct Linker { dep_graph: DepGraph, - prepare_outputs: Arc<OutputFilenames>, + output_filenames: Arc<OutputFilenames>, // Only present when incr. comp. is enabled. crate_hash: Option<Svh>, ongoing_codegen: Box<dyn Any>, @@ -263,7 +263,7 @@ pub struct Linker { impl Linker { pub fn link(self, sess: &Session, codegen_backend: &dyn CodegenBackend) -> Result<()> { let (codegen_results, work_products) = - codegen_backend.join_codegen(self.ongoing_codegen, sess, &self.prepare_outputs)?; + codegen_backend.join_codegen(self.ongoing_codegen, sess, &self.output_filenames)?; sess.compile_status()?; @@ -289,14 +289,14 @@ impl Linker { } if sess.opts.unstable_opts.no_link { - let rlink_file = self.prepare_outputs.with_extension(config::RLINK_EXT); + let rlink_file = self.output_filenames.with_extension(config::RLINK_EXT); CodegenResults::serialize_rlink(sess, &rlink_file, &codegen_results) .map_err(|error| sess.emit_fatal(FailedWritingFile { path: &rlink_file, error }))?; return Ok(()); } let _timer = sess.prof.verbose_generic_activity("link_crate"); - codegen_backend.link(sess, codegen_results, &self.prepare_outputs) + codegen_backend.link(sess, codegen_results, &self.output_filenames) } } |
