nordic-dev.net/rust-gpu
2
0
Fork 0
mirror of https://github.com/EmbarkStudios/rust-gpu.git synced 2024-11-22 06:45:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

link: remove workaround for mdsteele/rust-ar#19. (#730)

Browse Source
This commit is contained in:
Eduard-Mihai Burtescu 2021-08-19 09:45:29 +03:00 committed by GitHub
parent 4dcb50169f
commit f14046477a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@ -79,9 +79,9 @@ checksum = "595d3cfa7a60d4555cb5067b99f07142a08ea778de5cf993f7b75c7d8fabc486"
[[package]] [[package]]
name = "ar" name = "ar"
version = "0.8.0" version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "450575f58f7bee32816abbff470cbc47797397c2a81e0eaced4b98436daf52e1" checksum = "d67af77d68a931ecd5cbd8a3b5987d63a1d1d1278f7f6a60ae33db485cdebb69"
[[package]] [[package]]
name = "arrayvec" name = "arrayvec"

2
crates/rustc_codegen_spirv/Cargo.toml
View File

@ -35,7 +35,7 @@ num-traits = { version = "0.2", features = ["libm"] }
syn = { version = "1", features = ["visit", "visit-mut"] } syn = { version = "1", features = ["visit", "visit-mut"] }
# Normal dependencies. # Normal dependencies.
ar = "0.8.0" ar = "0.9.0"
bimap = "0.6" bimap = "0.6"
indexmap = "1.6.0" indexmap = "1.6.0"
rspirv = { git = "https://github.com/gfx-rs/rspirv.git", rev = "c2a11ba7961fa7c675800f50c1903f0e96c633f8" } rspirv = { git = "https://github.com/gfx-rs/rspirv.git", rev = "c2a11ba7961fa7c675800f50c1903f0e96c633f8" }

6
crates/rustc_codegen_spirv/src/link.rs
View File

@ -469,11 +469,7 @@ fn create_archive(files: &[&Path], metadata: &[u8], out_filename: &Path) {
"Duplicate filename in archive: {:?}", "Duplicate filename in archive: {:?}",
file.file_name().unwrap() file.file_name().unwrap()
); );
// NOTE(eddyb) this could just be `builder.append_path(file)`, but we builder.append_path(file).unwrap();
// have to work around https://github.com/mdsteele/rust-ar/issues/19.
builder
.append_file(name.as_bytes(), &mut File::open(file).unwrap())
.unwrap();
} }
builder.into_inner().unwrap(); builder.into_inner().unwrap();
} }