bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Inline process_rlink into try_process_rlink

Browse source
This commit is contained in:
bjorn3 2021-03-28 19:00:49 +02:00
parent 2fa7175293
commit 2acdc87700
1 changed files with 17 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

15
compiler/rustc_driver/src/lib.rs
View file

@ -599,7 +599,8 @@ fn show_content_with_pager(content: &str) {
} }
impl RustcDefaultCalls { impl RustcDefaultCalls {
fn process_rlink(sess: &Session, compiler: &interface::Compiler) -> Result<(), ErrorReported> { pub fn try_process_rlink(sess: &Session, compiler: &interface::Compiler) -> Compilation {
if sess.opts.debugging_opts.link_only {
if let Input::File(file) = compiler.input() { if let Input::File(file) = compiler.input() {
// FIXME: #![crate_type] and #![crate_name] support not implemented yet // FIXME: #![crate_type] and #![crate_name] support not implemented yet
let attrs = vec![]; let attrs = vec![];
@ -608,19 +609,15 @@ impl RustcDefaultCalls {
let rlink_data = fs::read_to_string(file).unwrap_or_else(|err| { let rlink_data = fs::read_to_string(file).unwrap_or_else(|err| {
sess.fatal(&format!("failed to read rlink file: {}", err)); sess.fatal(&format!("failed to read rlink file: {}", err));
}); });
let codegen_results: CodegenResults = json::decode(&rlink_data).unwrap_or_else(|err| { let codegen_results: CodegenResults =
json::decode(&rlink_data).unwrap_or_else(|err| {
sess.fatal(&format!("failed to decode rlink: {}", err)); sess.fatal(&format!("failed to decode rlink: {}", err));
}); });
compiler.codegen_backend().link(&sess, codegen_results, &outputs) let result = compiler.codegen_backend().link(&sess, codegen_results, &outputs);
abort_on_err(result, sess);
} else { } else {
sess.fatal("rlink must be a file") sess.fatal("rlink must be a file")
} }
}
pub fn try_process_rlink(sess: &Session, compiler: &interface::Compiler) -> Compilation {
if sess.opts.debugging_opts.link_only {
let result = RustcDefaultCalls::process_rlink(sess, compiler);
abort_on_err(result, sess);
Compilation::Stop Compilation::Stop
} else { } else {
Compilation::Continue Compilation::Continue