bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Port DlltoolFailImportLibrary and implement IntoDiagnosticArg for Cow<'a, str>

Browse source
This commit is contained in:
SLASHLogin 2022-08-26 19:01:22 +02:00
parent 81f7a8d7f1
commit c01546fcd6
4 changed files with 26 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
compiler/rustc_codegen_llvm/src/back/archive.rs
View file

@ -13,7 +13,8 @@ use object::read::macho::FatArch;
use crate::common;
use crate::errors::{
ArchiveBuildFailure, ErrorCallingDllTool, ErrorCreatingImportLibrary, ErrorWritingDEFFile,
ArchiveBuildFailure, DlltoolFailImportLibrary, ErrorCallingDllTool, ErrorCreatingImportLibrary,
ErrorWritingDEFFile,
};
use crate::llvm::archive_ro::{ArchiveRO, Child};
use crate::llvm::{self, ArchiveKind, LLVMMachineType, LLVMRustCOFFShortExport};
@ -244,11 +245,12 @@ impl ArchiveBuilderBuilder for LlvmArchiveBuilderBuilder {
Err(e) => {
sess.emit_fatal(ErrorCallingDllTool { error: e });
}
Ok(output) if !output.status.success() => sess.fatal(&format!(
"Dlltool could not create import library: {}\n{}",
String::from_utf8_lossy(&output.stdout),
String::from_utf8_lossy(&output.stderr)
)),
Ok(output) if !output.status.success() => {
sess.emit_fatal(DlltoolFailImportLibrary {
stdout: String::from_utf8_lossy(&output.stdout),
stderr: String::from_utf8_lossy(&output.stderr),
})
}
_ => {}
}
} else {

9
compiler/rustc_codegen_llvm/src/errors.rs
View file

@ -1,3 +1,5 @@
use std::borrow::Cow;
use rustc_errors::fluent;
use rustc_errors::DiagnosticBuilder;
use rustc_macros::SessionDiagnostic;
@ -102,3 +104,10 @@ pub(crate) struct ErrorWritingDEFFile {
pub(crate) struct ErrorCallingDllTool {
pub error: std::io::Error,
}
#[derive(SessionDiagnostic)]
#[diag(codegen_llvm::dlltool_fail_import_library)]
pub(crate) struct DlltoolFailImportLibrary<'a> {
pub stdout: Cow<'a, str>,
pub stderr: Cow<'a, str>,
}