mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify run_compiler control flow.

Browse Source 
I find `Compilation::and_then` hard to read. This commit removes it,
simplifying the control flow in `run_compiler`, and reducing the number
of lines of code.

In particular, `list_metadata` and `process_try_link` (renamed `rlink`)
are now only called if the relevant condition is true, rather than that
condition being checked within the function.
This commit is contained in:
Nicholas Nethercote 2023-11-17 14:15:56 +11:00
parent 5659cc57e9
commit 472f7c97a6
1 changed files with 55 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
compiler/rustc_driver_impl/src/lib.rs
View File

@ -373,20 +373,21 @@ fn run_compiler(
let handler = EarlyErrorHandler::new(sess.opts.error_format); let handler = EarlyErrorHandler::new(sess.opts.error_format);
let should_stop = print_crate_info(&handler, codegen_backend, sess, has_input); if print_crate_info(&handler, codegen_backend, sess, has_input) == Compilation::Stop {
if !has_input {
if should_stop == Compilation::Continue {
handler.early_error("no input filename given")
}
return sess.compile_status(); return sess.compile_status();
} }
let should_stop = should_stop if !has_input {
.and_then(|| list_metadata(&handler, sess, &*codegen_backend.metadata_loader())) handler.early_error("no input filename given"); // this is fatal
.and_then(|| try_process_rlink(sess, compiler)); }
if should_stop == Compilation::Stop { if !sess.opts.unstable_opts.ls.is_empty() {
list_metadata(&handler, sess, &*codegen_backend.metadata_loader());
return sess.compile_status();
}
if sess.opts.unstable_opts.link_only {
process_rlink(sess, compiler);
return sess.compile_status(); return sess.compile_status();
} }
@ -539,15 +540,6 @@ pub enum Compilation {
Continue, Continue,
} }
impl Compilation {
fn and_then<F: FnOnce() -> Compilation>(self, next: F) -> Compilation {
match self {
Compilation::Stop => Compilation::Stop,
Compilation::Continue => next(),
}
}
}
fn handle_explain(handler: &EarlyErrorHandler, registry: Registry, code: &str, color: ColorConfig) { fn handle_explain(handler: &EarlyErrorHandler, registry: Registry, code: &str, color: ColorConfig) {
let upper_cased_code = code.to_ascii_uppercase(); let upper_cased_code = code.to_ascii_uppercase();
let normalised = let normalised =
@ -652,44 +644,34 @@ fn show_md_content_with_pager(content: &str, color: ColorConfig) {
} }
} }
fn try_process_rlink(sess: &Session, compiler: &interface::Compiler) -> Compilation { fn process_rlink(sess: &Session, compiler: &interface::Compiler) {
if sess.opts.unstable_opts.link_only { assert!(sess.opts.unstable_opts.link_only);
if let Input::File(file) = &sess.io.input { if let Input::File(file) = &sess.io.input {
let outputs = compiler.build_output_filenames(sess, &[]); let outputs = compiler.build_output_filenames(sess, &[]);
let rlink_data = fs::read(file).unwrap_or_else(|err| { let rlink_data = fs::read(file).unwrap_or_else(|err| {
sess.emit_fatal(RlinkUnableToRead { err }); sess.emit_fatal(RlinkUnableToRead { err });
}); });
let codegen_results = match CodegenResults::deserialize_rlink(sess, rlink_data) { let codegen_results = match CodegenResults::deserialize_rlink(sess, rlink_data) {
Ok(codegen) => codegen, Ok(codegen) => codegen,
Err(err) => { Err(err) => {
match err { match err {
CodegenErrors::WrongFileType => sess.emit_fatal(RLinkWrongFileType), CodegenErrors::WrongFileType => sess.emit_fatal(RLinkWrongFileType),
CodegenErrors::EmptyVersionNumber => { CodegenErrors::EmptyVersionNumber => sess.emit_fatal(RLinkEmptyVersionNumber),
sess.emit_fatal(RLinkEmptyVersionNumber) CodegenErrors::EncodingVersionMismatch { version_array, rlink_version } => sess
} .emit_fatal(RLinkEncodingVersionMismatch { version_array, rlink_version }),
CodegenErrors::EncodingVersionMismatch { version_array, rlink_version } => { CodegenErrors::RustcVersionMismatch { rustc_version } => {
sess.emit_fatal(RLinkEncodingVersionMismatch { sess.emit_fatal(RLinkRustcVersionMismatch {
version_array, rustc_version,
rlink_version, current_version: sess.cfg_version,
}) })
} }
CodegenErrors::RustcVersionMismatch { rustc_version } => { };
sess.emit_fatal(RLinkRustcVersionMismatch { }
rustc_version, };
current_version: sess.cfg_version, let result = compiler.codegen_backend().link(sess, codegen_results, &outputs);
}) abort_on_err(result, sess);
}
};
}
};
let result = compiler.codegen_backend().link(sess, codegen_results, &outputs);
abort_on_err(result, sess);
} else {
sess.emit_fatal(RlinkNotAFile {})
}
Compilation::Stop
} else { } else {
Compilation::Continue sess.emit_fatal(RlinkNotAFile {})
} }
} }
@ -697,25 +679,25 @@ fn list_metadata(
handler: &EarlyErrorHandler, handler: &EarlyErrorHandler,
sess: &Session, sess: &Session,
metadata_loader: &dyn MetadataLoader, metadata_loader: &dyn MetadataLoader,
) -> Compilation { ) {
let ls_kinds = &sess.opts.unstable_opts.ls; match sess.io.input {
if !ls_kinds.is_empty() { Input::File(ref ifile) => {
match sess.io.input { let path = &(*ifile);
Input::File(ref ifile) => { let mut v = Vec::new();
let path = &(*ifile); locator::list_file_metadata(
let mut v = Vec::new(); &sess.target,
locator::list_file_metadata(&sess.target, path, metadata_loader, &mut v, ls_kinds) path,
.unwrap(); metadata_loader,
safe_println!("{}", String::from_utf8(v).unwrap()); &mut v,
} &sess.opts.unstable_opts.ls,
Input::Str { .. } => { )
handler.early_error("cannot list metadata for stdin"); .unwrap();
} safe_println!("{}", String::from_utf8(v).unwrap());
}
Input::Str { .. } => {
handler.early_error("cannot list metadata for stdin");
} }
return Compilation::Stop;
} }
Compilation::Continue
} }
fn print_crate_info( fn print_crate_info(