Skip to content

upgrade ar crate so we can do less copying when trimming rlibs #790

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
glandium merged 1 commit into from
Jun 11, 2020
Merged

upgrade ar crate so we can do less copying when trimming rlibs #790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ required-features = ["dist-server"]

[dependencies]
anyhow = "1.0"
ar = { version = "0.6", optional = true }
ar = { version = "0.8", optional = true }
atty = "0.2.6"
base64 = "0.11.0"
bincode = "1"
Expand Down
5 changes: 2 additions & 3 deletions src/compiler/rust.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1873,12 +1873,11 @@ impl pkg::InputsPackager for RustInputsPackager {
if entry.header().identifier() != b"rust.metadata.bin" {
continue;
}
let mut metadata = vec![];
io::copy(&mut entry, &mut metadata)?;
let mut metadata_ar = vec![];
{
let mut ar_builder = ar::Builder::new(&mut metadata_ar);
ar_builder.append(entry.header(), metadata.as_slice())?
let header = entry.header().clone();
ar_builder.append(&header, &mut entry)?
}
file_header.set_size(metadata_ar.len() as u64);
file_header.set_cksum();
Expand Down