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

UPDATE - address PR Comments

Browse Source 
FIX - StrippingDebugInfoFailed typo

DELETE - unneeded FIXME comment

UPDATE - only declare the error with ExtractBundledLibsError as an enum and use the Diagnostic derive macro
This commit is contained in:
Jhonny Bill Mena 2022-11-03 01:53:06 -04:00
parent 2678765d08
commit 28491a7b36
3 changed files with 40 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
compiler/rustc_codegen_ssa/src/back/archive.rs
View File

@ -10,7 +10,7 @@
use std::io;
use std::path::{Path, PathBuf};
use crate::errors::{ExtractBundledLibsError, ExtractBundledLibsErrorKind::*};
use crate::errors::ExtractBundledLibsError;
pub trait ArchiveBuilderBuilder {
fn new_archive_builder<'a>(&self, sess: &'a Session) -> Box<dyn ArchiveBuilder<'a> + 'a>;
@ -35,48 +35,30 @@ fn extract_bundled_libs<'a>(
outdir: &Path,
bundled_lib_file_names: &FxHashSet<Symbol>,
) -> Result<(), ExtractBundledLibsError<'_>> {
let archive_map = unsafe {
Mmap::map(File::open(rlib).map_err(|e| ExtractBundledLibsError {
kind: OpenFile,
rlib,
error: e.to_string(),
})?)
.map_err(|e| ExtractBundledLibsError {
kind: MmapFile,
rlib,
error: e.to_string(),
})?
};
let archive = ArchiveFile::parse(&*archive_map).map_err(|e| ExtractBundledLibsError {
kind: ParseArchive,
rlib,
error: e.to_string(),
})?;
let archive_map =
unsafe {
Mmap::map(File::open(rlib).map_err(|e| ExtractBundledLibsError::OpenFile {
rlib,
error: e.to_string(),
})?)
.map_err(|e| ExtractBundledLibsError::MmapFile { rlib, error: e.to_string() })?
};
let archive = ArchiveFile::parse(&*archive_map)
.map_err(|e| ExtractBundledLibsError::ParseArchive { rlib, error: e.to_string() })?;
for entry in archive.members() {
let entry = entry.map_err(|e| ExtractBundledLibsError {
kind: ReadEntry,
rlib,
error: e.to_string(),
})?;
let data = entry.data(&*archive_map).map_err(|e| ExtractBundledLibsError {
kind: ArchiveMember,
rlib,
error: e.to_string(),
})?;
let name = std::str::from_utf8(entry.name()).map_err(|e| ExtractBundledLibsError {
kind: ConvertName,
rlib,
error: e.to_string(),
let entry = entry
.map_err(|e| ExtractBundledLibsError::ReadEntry { rlib, error: e.to_string() })?;
let data = entry.data(&*archive_map).map_err(|e| {
ExtractBundledLibsError::ArchiveMember { rlib, error: e.to_string() }
})?;
let name = std::str::from_utf8(entry.name())
.map_err(|e| ExtractBundledLibsError::ConvertName { rlib, error: e.to_string() })?;
if !bundled_lib_file_names.contains(&Symbol::intern(name)) {
continue; // We need to extract only native libraries.
}
std::fs::write(&outdir.join(&name), data).map_err(|e| ExtractBundledLibsError {
kind: WriteFile,
rlib,
error: e.to_string(),
})?;
std::fs::write(&outdir.join(&name), data)
.map_err(|e| ExtractBundledLibsError::WriteFile { rlib, error: e.to_string() })?;
}
Ok(())
}

3
compiler/rustc_codegen_ssa/src/back/link.rs
View File

@ -1063,7 +1063,7 @@ fn strip_symbols_with_external_utility<'a>(
if !prog.status.success() {
let mut output = prog.stderr.clone();
output.extend_from_slice(&prog.stdout);
sess.emit_warning(errors::StrippingDebuInfoFailed {
sess.emit_warning(errors::StrippingDebugInfoFailed {
util,
status: prog.status,
output: escape_string(&output),
@ -1077,7 +1077,6 @@ fn strip_symbols_with_external_utility<'a>(
fn escape_string(s: &[u8]) -> String {
match str::from_utf8(s) {
Ok(s) => s.to_owned(),
// FIXME: return a type that can conform to IntoDiagnosticArg
Err(_) => format!("Non-UTF-8 output: {}", s.escape_ascii()),
}
}

64
compiler/rustc_codegen_ssa/src/errors.rs
View File

@ -423,7 +423,7 @@ pub struct UnableToRunDsymutil {
#[derive(Diagnostic)]
#[diag(codegen_ssa_stripping_debu_info_failed)]
#[note]
pub struct StrippingDebuInfoFailed<'a> {
pub struct StrippingDebugInfoFailed<'a> {
pub util: &'a str,
pub status: ExitStatus,
pub output: String,
@ -485,52 +485,28 @@ pub struct RlibArchiveBuildFailure {
#[diag(codegen_ssa_option_gcc_only)]
pub struct OptionGccOnly;
pub struct ExtractBundledLibsError<'a> {
pub kind: ExtractBundledLibsErrorKind,
pub rlib: &'a Path,
pub error: String,
}
#[derive(Diagnostic)]
pub enum ExtractBundledLibsError<'a> {
#[diag(codegen_ssa_extract_bundled_libs_open_file)]
OpenFile { rlib: &'a Path, error: String },
pub enum ExtractBundledLibsErrorKind {
OpenFile,
MmapFile,
ParseArchive,
ReadEntry,
ArchiveMember,
ConvertName,
WriteFile,
}
#[diag(codegen_ssa_extract_bundled_libs_mmap_file)]
MmapFile { rlib: &'a Path, error: String },
impl IntoDiagnostic<'_, !> for ExtractBundledLibsError<'_> {
fn into_diagnostic(self, handler: &'_ Handler) -> DiagnosticBuilder<'_, !> {
let mut diag = match self.kind {
ExtractBundledLibsErrorKind::OpenFile => {
handler.struct_fatal(fluent::codegen_ssa_extract_bundled_libs_open_file)
}
ExtractBundledLibsErrorKind::MmapFile => {
handler.struct_fatal(fluent::codegen_ssa_extract_bundled_libs_mmap_file)
}
ExtractBundledLibsErrorKind::ParseArchive => {
handler.struct_fatal(fluent::codegen_ssa_extract_bundled_libs_parse_archive)
}
ExtractBundledLibsErrorKind::ReadEntry => {
handler.struct_fatal(fluent::codegen_ssa_extract_bundled_libs_read_entry)
}
ExtractBundledLibsErrorKind::ArchiveMember => {
handler.struct_fatal(fluent::codegen_ssa_extract_bundled_libs_archive_member)
}
ExtractBundledLibsErrorKind::ConvertName => {
handler.struct_fatal(fluent::codegen_ssa_extract_bundled_libs_convert_name)
}
ExtractBundledLibsErrorKind::WriteFile => {
handler.struct_fatal(fluent::codegen_ssa_extract_bundled_libs_write_file)
}
};
#[diag(codegen_ssa_extract_bundled_libs_parse_archive)]
ParseArchive { rlib: &'a Path, error: String },
diag.set_arg("rlib", self.rlib);
diag.set_arg("error", self.error);
diag
}
#[diag(codegen_ssa_extract_bundled_libs_read_entry)]
ReadEntry { rlib: &'a Path, error: String },
#[diag(codegen_ssa_extract_bundled_libs_archive_member)]
ArchiveMember { rlib: &'a Path, error: String },
#[diag(codegen_ssa_extract_bundled_libs_convert_name)]
ConvertName { rlib: &'a Path, error: String },
#[diag(codegen_ssa_extract_bundled_libs_write_file)]
WriteFile { rlib: &'a Path, error: String },
}
#[derive(Diagnostic)]