Skip to content

Commit f140464

Browse files
authored
link: remove workaround for mdsteele/rust-ar#19. (#730)
1 parent 4dcb501 commit f140464

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/rustc_codegen_spirv/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ num-traits = { version = "0.2", features = ["libm"] }
3535
syn = { version = "1", features = ["visit", "visit-mut"] }
3636

3737
# Normal dependencies.
38-
ar = "0.8.0"
38+
ar = "0.9.0"
3939
bimap = "0.6"
4040
indexmap = "1.6.0"
4141
rspirv = { git = "https://github.com/gfx-rs/rspirv.git", rev = "c2a11ba7961fa7c675800f50c1903f0e96c633f8" }

crates/rustc_codegen_spirv/src/link.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -469,11 +469,7 @@ fn create_archive(files: &[&Path], metadata: &[u8], out_filename: &Path) {
469469
"Duplicate filename in archive: {:?}",
470470
file.file_name().unwrap()
471471
);
472-
// NOTE(eddyb) this could just be `builder.append_path(file)`, but we
473-
// have to work around https://github.com/mdsteele/rust-ar/issues/19.
474-
builder
475-
.append_file(name.as_bytes(), &mut File::open(file).unwrap())
476-
.unwrap();
472+
builder.append_path(file).unwrap();
477473
}
478474
builder.into_inner().unwrap();
479475
}

0 commit comments

Comments
 (0)