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

rustup update (#238)

Browse Source
This commit is contained in:
Ashley Hauck 2020-11-13 10:35:34 +01:00 committed by GitHub
parent a79da96307
commit 2f63addede
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/rustc_codegen_spirv/src/lib.rs
View File

@ -166,7 +166,7 @@ fn target_options() -> Target {
emit_debug_gdb_scripts: false, emit_debug_gdb_scripts: false,
linker_flavor: LinkerFlavor::Ld, linker_flavor: LinkerFlavor::Ld,
panic_strategy: PanicStrategy::Abort, panic_strategy: PanicStrategy::Abort,
target_os: "unknown".to_string(), os: "unknown".to_string(),
// TODO: Investigate if main_needs_argc_argv is useful (for building exes) // TODO: Investigate if main_needs_argc_argv is useful (for building exes)
main_needs_argc_argv: false, main_needs_argc_argv: false,
..Default::default() ..Default::default()

2
crates/rustc_codegen_spirv/src/symbols.rs
View File

@ -410,7 +410,7 @@ pub fn parse_attrs(
let result = let result =
attrs.iter().flat_map(|attr| { attrs.iter().flat_map(|attr| {
let is_spirv = match attr.kind { let is_spirv = match attr.kind {
AttrKind::Normal(ref item) => { AttrKind::Normal(ref item, _) => {
// TODO: We ignore the rest of the path. Is this right? // TODO: We ignore the rest of the path. Is this right?
let last = item.path.segments.last(); let last = item.path.segments.last();
last.map_or(false, |seg| seg.ident.name == cx.sym.spirv) last.map_or(false, |seg| seg.ident.name == cx.sym.spirv)

2
rust-toolchain
View File

@ -1 +1 @@
nightly-2020-11-09 nightly-2020-11-13

2
setup.bat
View File

@ -1,6 +1,6 @@
setlocal setlocal
rustup toolchain install nightly-2020-11-09 --component rust-src rustc-dev llvm-tools-preview rustup toolchain install nightly-2020-11-13 --component rust-src rustc-dev llvm-tools-preview
git submodule init git submodule init
git submodule update git submodule update

2
setup.sh
View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
rustup toolchain install nightly-2020-11-09 --component rust-src rustc-dev llvm-tools-preview rustup toolchain install nightly-2020-11-13 --component rust-src rustc-dev llvm-tools-preview
git submodule init git submodule init
git submodule update git submodule update