Rollup merge of #123687 - bjorn3:ar_archive_writer_0_2_0, r=oli-obk
Update ar_archive_writer to 0.2.0 This adds a whole bunch of tests checking for any difference with llvm's archive writer. It also fixes two mistakes in the porting from C++ to Rust. The first one causes a divergence for Mach-O archives which may or may not be harmless. The second will definitively cause issues, but only applies to thin archives, which rustc currently doesn't create.
This commit is contained in:
commit
9a7adb8d81
3 changed files with 4 additions and 11 deletions
|
@ -210,9 +210,9 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ar_archive_writer"
|
name = "ar_archive_writer"
|
||||||
version = "0.1.5"
|
version = "0.2.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "9792d37ca5173d7e7f4fe453739a0671d0557915a030a383d6b866476bbc3e71"
|
checksum = "f0c269894b6fe5e9d7ada0cf69b5bf847ff35bc25fc271f08e1d080fce80339a"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"object 0.32.2",
|
"object 0.32.2",
|
||||||
]
|
]
|
||||||
|
|
|
@ -5,7 +5,7 @@ edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
# tidy-alphabetical-start
|
# tidy-alphabetical-start
|
||||||
ar_archive_writer = "0.1.5"
|
ar_archive_writer = "0.2.0"
|
||||||
bitflags = "2.4.1"
|
bitflags = "2.4.1"
|
||||||
cc = "1.0.90"
|
cc = "1.0.90"
|
||||||
itertools = "0.12"
|
itertools = "0.12"
|
||||||
|
|
|
@ -285,14 +285,7 @@ impl<'a> ArArchiveBuilder<'a> {
|
||||||
.tempfile_in(output.parent().unwrap_or_else(|| Path::new("")))
|
.tempfile_in(output.parent().unwrap_or_else(|| Path::new("")))
|
||||||
.map_err(|err| io_error_context("couldn't create a temp file", err))?;
|
.map_err(|err| io_error_context("couldn't create a temp file", err))?;
|
||||||
|
|
||||||
write_archive_to_stream(
|
write_archive_to_stream(archive_tmpfile.as_file_mut(), &entries, archive_kind, false)?;
|
||||||
archive_tmpfile.as_file_mut(),
|
|
||||||
&entries,
|
|
||||||
true,
|
|
||||||
archive_kind,
|
|
||||||
true,
|
|
||||||
false,
|
|
||||||
)?;
|
|
||||||
|
|
||||||
let any_entries = !entries.is_empty();
|
let any_entries = !entries.is_empty();
|
||||||
drop(entries);
|
drop(entries);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue