user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor refactoring

Browse source
This commit is contained in:
varkor 2018-01-09 19:55:36 +00:00
parent ba76092c2e
commit d97da7d536
1 changed files with 16 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/librustc_driver/driver.rs
View file

@ -145,26 +145,23 @@ pub fn compile_input(trans: Box<TransCrate>,
let output_paths = generated_output_paths(sess, &outputs, &crate_name);
// Ensure the source file isn't accidentally overwritten during compilation.
match *input_path {
Some(ref input_path) => {
if sess.opts.will_create_output_file() {
if output_contains_path(&output_paths, input_path) {
sess.err(&format!(
"the input file \"{}\" would be overwritten by the generated \
executable",
input_path.display()));
return Err(CompileIncomplete::Stopped);
}
if let Some(dir_path) = output_conflicts_with_dir(&output_paths) {
sess.err(&format!(
"the generated executable for the input file \"{}\" conflicts with the \
existing directory \"{}\"",
input_path.display(), dir_path.display()));
return Err(CompileIncomplete::Stopped);
}
if let Some(ref input_path) = *input_path {
if sess.opts.will_create_output_file() {
if output_contains_path(&output_paths, input_path) {
sess.err(&format!(
"the input file \"{}\" would be overwritten by the generated \
executable",
input_path.display()));
return Err(CompileIncomplete::Stopped);
}
},
None => {}
if let Some(dir_path) = output_conflicts_with_dir(&output_paths) {
sess.err(&format!(
"the generated executable for the input file \"{}\" conflicts with the \
existing directory \"{}\"",
input_path.display(), dir_path.display()));
return Err(CompileIncomplete::Stopped);
}
}
}
write_out_deps(sess, &outputs, &output_paths);