nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-25 16:24:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename Linker::prepare_outputs as output_filenames.

Browse Source 
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.
This commit is contained in:
Nicholas Nethercote 2023-11-17 09:04:45 +11:00
parent aed8e1f3b6
commit 94c9075b27
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compiler/rustc_interface/src/queries.rs
View File

@ -240,7 +240,7 @@ impl<'tcx> Queries<'tcx> {
self.global_ctxt()?.enter(|tcx| { self.global_ctxt()?.enter(|tcx| {
Ok(Linker { Ok(Linker {
dep_graph: tcx.dep_graph.clone(), 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() { crate_hash: if tcx.needs_crate_hash() {
Some(tcx.crate_hash(LOCAL_CRATE)) Some(tcx.crate_hash(LOCAL_CRATE))
} else { } else {
@ -254,7 +254,7 @@ impl<'tcx> Queries<'tcx> {
pub struct Linker { pub struct Linker {
dep_graph: DepGraph, dep_graph: DepGraph,
prepare_outputs: Arc<OutputFilenames>, output_filenames: Arc<OutputFilenames>,
// Only present when incr. comp. is enabled. // Only present when incr. comp. is enabled.
crate_hash: Option<Svh>, crate_hash: Option<Svh>,
ongoing_codegen: Box<dyn Any>, ongoing_codegen: Box<dyn Any>,
@ -263,7 +263,7 @@ pub struct Linker {
impl Linker { impl Linker {
pub fn link(self, sess: &Session, codegen_backend: &dyn CodegenBackend) -> Result<()> { pub fn link(self, sess: &Session, codegen_backend: &dyn CodegenBackend) -> Result<()> {
let (codegen_results, work_products) = 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()?; sess.compile_status()?;
@ -289,14 +289,14 @@ impl Linker {
} }
if sess.opts.unstable_opts.no_link { 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) CodegenResults::serialize_rlink(sess, &rlink_file, &codegen_results)
.map_err(|error| sess.emit_fatal(FailedWritingFile { path: &rlink_file, error }))?; .map_err(|error| sess.emit_fatal(FailedWritingFile { path: &rlink_file, error }))?;
return Ok(()); return Ok(());
} }
let _timer = sess.prof.verbose_generic_activity("link_crate"); 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)
} }
} }