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

Avoid converting filenames into strings where possible

Browse Source
This commit is contained in:
bjorn3 2021-08-07 14:28:07 +02:00
parent 1da50543dd
commit 6681694cb5
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/archive.rs
View File

@ -29,7 +29,7 @@ pub(crate) struct ArArchiveBuilder<'a> {
src_archives: Vec<File>,
// Don't use `HashMap` here, as the order is important. `rust.metadata.bin` must always be at
// the end of an archive for linkers to not get confused.
entries: Vec<(String, ArchiveEntry)>,
entries: Vec<(Vec<u8>, ArchiveEntry)>,
}
impl<'a> ArchiveBuilder<'a> for ArArchiveBuilder<'a> {
@ -44,7 +44,7 @@ fn new(sess: &'a Session, output: &Path, input: Option<&Path>) -> Self {
for entry in archive.members() {
let entry = entry.unwrap();
entries.push((
String::from_utf8(entry.name().to_vec()).unwrap(),
entry.name().to_vec(),
ArchiveEntry::FromArchive { archive_index: 0, file_range: entry.file_range() },
));
}
@ -68,21 +68,21 @@ fn new(sess: &'a Session, output: &Path, input: Option<&Path>) -> Self {
}
fn src_files(&mut self) -> Vec<String> {
self.entries.iter().map(|(name, _)| name.clone()).collect()
self.entries.iter().map(|(name, _)| String::from_utf8(name.clone()).unwrap()).collect()
}
fn remove_file(&mut self, name: &str) {
let index = self
.entries
.iter()
.position(|(entry_name, _)| entry_name == name)
.position(|(entry_name, _)| entry_name == name.as_bytes())
.expect("Tried to remove file not existing in src archive");
self.entries.remove(index);
}
fn add_file(&mut self, file: &Path) {
self.entries.push((
file.file_name().unwrap().to_str().unwrap().to_string(),
file.file_name().unwrap().to_str().unwrap().to_string().into_bytes(),
ArchiveEntry::File(file.to_owned()),
));
}
@ -165,7 +165,7 @@ enum BuilderKind {
match object::File::parse(&*data) {
Ok(object) => {
symbol_table.insert(
entry_name.as_bytes().to_vec(),
entry_name.to_vec(),
object
.symbols()
.filter_map(|symbol| {
@ -190,7 +190,8 @@ enum BuilderKind {
} else {
sess.fatal(&format!(
"error parsing `{}` during archive creation: {}",
entry_name, err
String::from_utf8_lossy(&entry_name),
err
));
}
}
@ -209,7 +210,7 @@ enum BuilderKind {
err
));
}),
entries.iter().map(|(name, _)| name.as_bytes().to_vec()).collect(),
entries.iter().map(|(name, _)| name.clone()).collect(),
ar::GnuSymbolTableFormat::Size32,
symbol_table,
)
@ -232,7 +233,7 @@ enum BuilderKind {
// Add all files
for (entry_name, data) in entries.into_iter() {
let header = ar::Header::new(entry_name.into_bytes(), data.len() as u64);
let header = ar::Header::new(entry_name, data.len() as u64);
match builder {
BuilderKind::Bsd(ref mut builder) => builder.append(&header, &mut &*data).unwrap(),
BuilderKind::Gnu(ref mut builder) => builder.append(&header, &mut &*data).unwrap(),
@ -282,7 +283,7 @@ fn add_archive<F>(&mut self, archive_path: PathBuf, mut skip: F) -> io::Result<(
.map_err(|err| io::Error::new(io::ErrorKind::InvalidData, err))?;
if !skip(&file_name) {
self.entries.push((
file_name,
file_name.into_bytes(),
ArchiveEntry::FromArchive { archive_index, file_range: entry.file_range() },
));
}