diff options
| author | Adrian Tombu <adrian@otso.fr> | 2022-08-24 14:12:39 +0200 |
|---|---|---|
| committer | Adrian Tombu <adrian@otso.fr> | 2022-08-25 18:06:12 +0200 |
| commit | 1c575c5fe05110a628a7bf0e609602bb9066edec (patch) | |
| tree | 5499a0c5042eb960a04a66f5ad8573f6b93d92f6 | |
| parent | e7ded9246c12319330c39b3ab10162935ccbfe17 (diff) | |
| download | rust-1c575c5fe05110a628a7bf0e609602bb9066edec.tar.gz rust-1c575c5fe05110a628a7bf0e609602bb9066edec.zip | |
Use std::io::Error and remove useless to_string
| -rw-r--r-- | compiler/rustc_driver/src/lib.rs | 6 | ||||
| -rw-r--r-- | compiler/rustc_driver/src/session_diagnostics.rs | 4 | ||||
| -rw-r--r-- | compiler/rustc_error_messages/locales/en-US/driver.ftl | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/compiler/rustc_driver/src/lib.rs b/compiler/rustc_driver/src/lib.rs index 33af7fd0e42..90e4d629b61 100644 --- a/compiler/rustc_driver/src/lib.rs +++ b/compiler/rustc_driver/src/lib.rs @@ -586,12 +586,12 @@ pub fn try_process_rlink(sess: &Session, compiler: &interface::Compiler) -> Comp sess.init_crate_types(collect_crate_types(sess, &[])); let outputs = compiler.build_output_filenames(sess, &[]); let rlink_data = fs::read(file).unwrap_or_else(|err| { - sess.emit_fatal(RlinkUnableToRead { error_message: err.to_string() }); + sess.emit_fatal(RlinkUnableToRead { err }); }); let codegen_results = match CodegenResults::deserialize_rlink(rlink_data) { Ok(codegen) => codegen, - Err(error) => { - sess.emit_fatal(RlinkUnableToDeserialize { error_message: error.to_string() }); + Err(error_message) => { + sess.emit_fatal(RlinkUnableToDeserialize { error_message }); } }; let result = compiler.codegen_backend().link(sess, codegen_results, &outputs); diff --git a/compiler/rustc_driver/src/session_diagnostics.rs b/compiler/rustc_driver/src/session_diagnostics.rs index ed10a66c823..a5dbef45475 100644 --- a/compiler/rustc_driver/src/session_diagnostics.rs +++ b/compiler/rustc_driver/src/session_diagnostics.rs @@ -3,7 +3,7 @@ use rustc_macros::SessionDiagnostic; #[derive(SessionDiagnostic)] #[diag(driver::rlink_unable_to_read)] pub(crate) struct RlinkUnableToRead { - pub error_message: String, + pub err: std::io::Error, } #[derive(SessionDiagnostic)] @@ -14,4 +14,4 @@ pub(crate) struct RlinkUnableToDeserialize { #[derive(SessionDiagnostic)] #[diag(driver::rlink_no_a_file)] -pub(crate) struct RlinkNotAFile {} +pub(crate) struct RlinkNotAFile; diff --git a/compiler/rustc_error_messages/locales/en-US/driver.ftl b/compiler/rustc_error_messages/locales/en-US/driver.ftl index 57104612cc8..0a2f0e8f883 100644 --- a/compiler/rustc_error_messages/locales/en-US/driver.ftl +++ b/compiler/rustc_error_messages/locales/en-US/driver.ftl @@ -1,4 +1,4 @@ -driver_rlink_unable_to_read = failed to read rlink file: `{$error_message}` +driver_rlink_unable_to_read = failed to read rlink file: `{$err}` driver_rlink_unable_to_deserialize = could not deserialize .rlink file: `{$error_message}` |