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

Update to nightly-2022-09-25.

Browse Source
This commit is contained in:
Eduard-Mihai Burtescu 2022-10-28 12:06:04 +03:00 committed by Eduard-Mihai Burtescu
parent 08250e5ca1
commit dcf37b75a7
3 changed files with 6 additions and 6 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 :/
//const REQUIRED_RUST_TOOLCHAIN: &str = include_str!("../../rust-toolchain");
const REQUIRED_RUST_TOOLCHAIN: &str = r#"[toolchain]
channel = "nightly-2022-09-11"
channel = "nightly-2022-09-25"
components = ["rust-src", "rustc-dev", "llvm-tools-preview"]
# commit_hash = 2287107588d92889d282e6cd3c1ca5df34cd34a5"#;
# commit_hash = 3f83906b30798bf61513fa340524cebf6676f9db"#;
fn get_rustc_commit_hash() -> Result<String, Box<dyn Error>> {
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]'".
[toolchain]
channel = "nightly-2022-09-11"
channel = "nightly-2022-09-25"
components = ["rust-src", "rustc-dev", "llvm-tools-preview"]
# commit_hash = 2287107588d92889d282e6cd3c1ca5df34cd34a5
# commit_hash = 3f83906b30798bf61513fa340524cebf6676f9db
# 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.

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

@ -1,7 +1,7 @@
error: Cannot memcpy dynamically sized data
--> $CORE_SRC/intrinsics.rs:2403:9
--> $CORE_SRC/intrinsics.rs:2416:9
|
2403 | copy(src, dst, count)
2416 | copy(src, dst, count)
| ^^^^^^^^^^^^^^^^^^^^^
error: aborting due to previous error