Skip to content

Commit 1c575c5

Browse files
committed
Use std::io::Error and remove useless to_string
1 parent e7ded92 commit 1c575c5

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

compiler/rustc_driver/src/lib.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -586,12 +586,12 @@ pub fn try_process_rlink(sess: &Session, compiler: &interface::Compiler) -> Comp
586586
sess.init_crate_types(collect_crate_types(sess, &[]));
587587
let outputs = compiler.build_output_filenames(sess, &[]);
588588
let rlink_data = fs::read(file).unwrap_or_else(|err| {
589-
sess.emit_fatal(RlinkUnableToRead { error_message: err.to_string() });
589+
sess.emit_fatal(RlinkUnableToRead { err });
590590
});
591591
let codegen_results = match CodegenResults::deserialize_rlink(rlink_data) {
592592
Ok(codegen) => codegen,
593-
Err(error) => {
594-
sess.emit_fatal(RlinkUnableToDeserialize { error_message: error.to_string() });
593+
Err(error_message) => {
594+
sess.emit_fatal(RlinkUnableToDeserialize { error_message });
595595
}
596596
};
597597
let result = compiler.codegen_backend().link(sess, codegen_results, &outputs);

compiler/rustc_driver/src/session_diagnostics.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use rustc_macros::SessionDiagnostic;
33
#[derive(SessionDiagnostic)]
44
#[diag(driver::rlink_unable_to_read)]
55
pub(crate) struct RlinkUnableToRead {
6-
pub error_message: String,
6+
pub err: std::io::Error,
77
}
88

99
#[derive(SessionDiagnostic)]
@@ -14,4 +14,4 @@ pub(crate) struct RlinkUnableToDeserialize {
1414

1515
#[derive(SessionDiagnostic)]
1616
#[diag(driver::rlink_no_a_file)]
17-
pub(crate) struct RlinkNotAFile {}
17+
pub(crate) struct RlinkNotAFile;

compiler/rustc_error_messages/locales/en-US/driver.ftl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
driver_rlink_unable_to_read = failed to read rlink file: `{$error_message}`
1+
driver_rlink_unable_to_read = failed to read rlink file: `{$err}`
22
33
driver_rlink_unable_to_deserialize = could not deserialize .rlink file: `{$error_message}`
44

0 commit comments

Comments
 (0)