bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Group some commonly passed together values into a struct

Browse source
This commit is contained in:
Oli Scherer 2022-12-07 08:42:21 +00:00
parent f5c601492e
commit 42f75f1e46
7 changed files with 77 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

17
compiler/rustc_interface/src/passes.rs
View file

@ -673,20 +673,13 @@ pub fn prepare_outputs(
let _timer = sess.timer("prepare_outputs");
// FIXME: rustdoc passes &[] instead of &krate.attrs here
let outputs = util::build_output_filenames(
&compiler.input,
&compiler.output_dir,
&compiler.output_file,
&compiler.temps_dir,
&krate.attrs,
sess,
);
let outputs = util::build_output_filenames(&compiler.io, &krate.attrs, sess);
let output_paths =
generated_output_paths(sess, &outputs, compiler.output_file.is_some(), crate_name);
generated_output_paths(sess, &outputs, compiler.io.output_file.is_some(), crate_name);
// Ensure the source file isn't accidentally overwritten during compilation.
if let Some(ref input_path) = compiler.input.opt_path() {
if let Some(ref input_path) = compiler.io.input.opt_path() {
if sess.opts.will_create_output_file() {
if output_contains_path(&output_paths, input_path) {
let reported = sess.emit_err(InputFileWouldBeOverWritten { path: input_path });
@ -700,7 +693,7 @@ pub fn prepare_outputs(
}
}
if let Some(ref dir) = compiler.temps_dir {
if let Some(ref dir) = compiler.io.temps_dir {
if fs::create_dir_all(dir).is_err() {
let reported = sess.emit_err(TempsDirError);
return Err(reported);
@ -713,7 +706,7 @@ pub fn prepare_outputs(
&& sess.opts.output_types.len() == 1;
if !only_dep_info {
if let Some(ref dir) = compiler.output_dir {
if let Some(ref dir) = compiler.io.output_dir {
if fs::create_dir_all(dir).is_err() {
let reported = sess.emit_err(OutDirError);
return Err(reported);