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

Update to nightly-2022-10-29

Browse Source
This commit is contained in:
Sylvester Hesp 2022-11-30 14:33:48 +01:00
parent d000e9699b
commit fb7e13cdeb
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/rustc_codegen_spirv/build.rs
View File

@ -10,9 +10,9 @@ use std::process::{Command, ExitCode};
/// `cargo publish`. We need to figure out a way to do this properly, but let's hardcode it for now :/ /// `cargo publish`. We need to figure out a way to do this properly, but let's hardcode it for now :/
//const REQUIRED_RUST_TOOLCHAIN: &str = include_str!("../../rust-toolchain"); //const REQUIRED_RUST_TOOLCHAIN: &str = include_str!("../../rust-toolchain");
const REQUIRED_RUST_TOOLCHAIN: &str = r#"[toolchain] const REQUIRED_RUST_TOOLCHAIN: &str = r#"[toolchain]
channel = "nightly-2022-10-15" channel = "nightly-2022-10-29"
components = ["rust-src", "rustc-dev", "llvm-tools-preview"] components = ["rust-src", "rustc-dev", "llvm-tools-preview"]
# commit_hash = bf15a9e5263fcea065a7ae9c179b2d24c2deb670"#; # commit_hash = 9565dfeb4e6225177bbe78f18cd48a7982f34401"#;
fn get_rustc_commit_hash() -> Result<String, Box<dyn Error>> { fn get_rustc_commit_hash() -> Result<String, Box<dyn Error>> {
let rustc = std::env::var("RUSTC").unwrap_or_else(|_| String::from("rustc")); let rustc = std::env::var("RUSTC").unwrap_or_else(|_| String::from("rustc"));

4
rust-toolchain
View File

@ -5,9 +5,9 @@
# to the user in the error, instead of "error: invalid channel name '[toolchain]'". # to the user in the error, instead of "error: invalid channel name '[toolchain]'".
[toolchain] [toolchain]
channel = "nightly-2022-10-15" channel = "nightly-2022-10-29"
components = ["rust-src", "rustc-dev", "llvm-tools-preview"] components = ["rust-src", "rustc-dev", "llvm-tools-preview"]
# commit_hash = bf15a9e5263fcea065a7ae9c179b2d24c2deb670 # commit_hash = 9565dfeb4e6225177bbe78f18cd48a7982f34401
# Whenever changing the nightly channel, update the commit hash above, and make # Whenever changing the nightly channel, update the commit hash above, and make
# sure to change REQUIRED_TOOLCHAIN in crates/rustc_codegen_spirv/src/build.rs also. # sure to change REQUIRED_TOOLCHAIN in crates/rustc_codegen_spirv/src/build.rs also.

4
tests/ui/dis/ptr_copy.normal.stderr
View File

@ -1,7 +1,7 @@
error: Cannot memcpy dynamically sized data error: Cannot memcpy dynamically sized data
--> $CORE_SRC/intrinsics.rs:2431:9 --> $CORE_SRC/intrinsics.rs:2449:9
| |
2431 | copy(src, dst, count) 2449 | copy(src, dst, count)
| ^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^
| |
= note: Stack: = note: Stack:

2
tests/ui/dis/ptr_read.stderr
View File

@ -2,7 +2,7 @@
%4 = OpFunctionParameter %5 %4 = OpFunctionParameter %5
%6 = OpFunctionParameter %5 %6 = OpFunctionParameter %5
%7 = OpLabel %7 = OpLabel
OpLine %8 1122 8 OpLine %8 1139 8
%9 = OpLoad %10 %4 %9 = OpLoad %10 %4
OpLine %11 7 13 OpLine %11 7 13
OpStore %6 %9 OpStore %6 %9

2
tests/ui/dis/ptr_read_method.stderr
View File

@ -2,7 +2,7 @@
%4 = OpFunctionParameter %5 %4 = OpFunctionParameter %5
%6 = OpFunctionParameter %5 %6 = OpFunctionParameter %5
%7 = OpLabel %7 = OpLabel
OpLine %8 1122 8 OpLine %8 1139 8
%9 = OpLoad %10 %4 %9 = OpLoad %10 %4
OpLine %11 7 13 OpLine %11 7 13
OpStore %6 %9 OpStore %6 %9

2
tests/ui/dis/ptr_write.stderr
View File

@ -4,7 +4,7 @@
%7 = OpLabel %7 = OpLabel
OpLine %8 7 35 OpLine %8 7 35
%9 = OpLoad %10 %4 %9 = OpLoad %10 %4
OpLine %11 1316 8 OpLine %11 1336 8
OpStore %6 %9 OpStore %6 %9
OpLine %8 8 1 OpLine %8 8 1
OpReturn OpReturn

2
tests/ui/dis/ptr_write_method.stderr
View File

@ -4,7 +4,7 @@
%7 = OpLabel %7 = OpLabel
OpLine %8 7 37 OpLine %8 7 37
%9 = OpLoad %10 %4 %9 = OpLoad %10 %4
OpLine %11 1316 8 OpLine %11 1336 8
OpStore %6 %9 OpStore %6 %9
OpLine %8 8 1 OpLine %8 8 1
OpReturn OpReturn