From fb7e13cdeb2e5c6cead7c29ffc8c77c1179a6eb3 Mon Sep 17 00:00:00 2001 From: Sylvester Hesp Date: Wed, 30 Nov 2022 14:33:48 +0100 Subject: [PATCH] Update to nightly-2022-10-29 --- crates/rustc_codegen_spirv/build.rs | 4 ++-- rust-toolchain | 4 ++-- tests/ui/dis/ptr_copy.normal.stderr | 4 ++-- tests/ui/dis/ptr_read.stderr | 2 +- tests/ui/dis/ptr_read_method.stderr | 2 +- tests/ui/dis/ptr_write.stderr | 2 +- tests/ui/dis/ptr_write_method.stderr | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/crates/rustc_codegen_spirv/build.rs b/crates/rustc_codegen_spirv/build.rs index 43d42a6f84..9123d273dd 100644 --- a/crates/rustc_codegen_spirv/build.rs +++ b/crates/rustc_codegen_spirv/build.rs @@ -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-10-15" +channel = "nightly-2022-10-29" components = ["rust-src", "rustc-dev", "llvm-tools-preview"] -# commit_hash = bf15a9e5263fcea065a7ae9c179b2d24c2deb670"#; +# commit_hash = 9565dfeb4e6225177bbe78f18cd48a7982f34401"#; fn get_rustc_commit_hash() -> Result> { let rustc = std::env::var("RUSTC").unwrap_or_else(|_| String::from("rustc")); diff --git a/rust-toolchain b/rust-toolchain index d4559e9fc9..b20167d23b 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -5,9 +5,9 @@ # to the user in the error, instead of "error: invalid channel name '[toolchain]'". [toolchain] -channel = "nightly-2022-10-15" +channel = "nightly-2022-10-29" 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 # sure to change REQUIRED_TOOLCHAIN in crates/rustc_codegen_spirv/src/build.rs also. diff --git a/tests/ui/dis/ptr_copy.normal.stderr b/tests/ui/dis/ptr_copy.normal.stderr index b6969fcc93..d3f5f03c2d 100644 --- a/tests/ui/dis/ptr_copy.normal.stderr +++ b/tests/ui/dis/ptr_copy.normal.stderr @@ -1,7 +1,7 @@ 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: diff --git a/tests/ui/dis/ptr_read.stderr b/tests/ui/dis/ptr_read.stderr index 1138fe40c3..c20975c585 100644 --- a/tests/ui/dis/ptr_read.stderr +++ b/tests/ui/dis/ptr_read.stderr @@ -2,7 +2,7 @@ %4 = OpFunctionParameter %5 %6 = OpFunctionParameter %5 %7 = OpLabel -OpLine %8 1122 8 +OpLine %8 1139 8 %9 = OpLoad %10 %4 OpLine %11 7 13 OpStore %6 %9 diff --git a/tests/ui/dis/ptr_read_method.stderr b/tests/ui/dis/ptr_read_method.stderr index 1138fe40c3..c20975c585 100644 --- a/tests/ui/dis/ptr_read_method.stderr +++ b/tests/ui/dis/ptr_read_method.stderr @@ -2,7 +2,7 @@ %4 = OpFunctionParameter %5 %6 = OpFunctionParameter %5 %7 = OpLabel -OpLine %8 1122 8 +OpLine %8 1139 8 %9 = OpLoad %10 %4 OpLine %11 7 13 OpStore %6 %9 diff --git a/tests/ui/dis/ptr_write.stderr b/tests/ui/dis/ptr_write.stderr index d290c2dda0..a3442ed57d 100644 --- a/tests/ui/dis/ptr_write.stderr +++ b/tests/ui/dis/ptr_write.stderr @@ -4,7 +4,7 @@ %7 = OpLabel OpLine %8 7 35 %9 = OpLoad %10 %4 -OpLine %11 1316 8 +OpLine %11 1336 8 OpStore %6 %9 OpLine %8 8 1 OpReturn diff --git a/tests/ui/dis/ptr_write_method.stderr b/tests/ui/dis/ptr_write_method.stderr index 0d96a3fc28..8ea9dae2dc 100644 --- a/tests/ui/dis/ptr_write_method.stderr +++ b/tests/ui/dis/ptr_write_method.stderr @@ -4,7 +4,7 @@ %7 = OpLabel OpLine %8 7 37 %9 = OpLoad %10 %4 -OpLine %11 1316 8 +OpLine %11 1336 8 OpStore %6 %9 OpLine %8 8 1 OpReturn