From 86d6042204e4c0f9ab04120155636d714037fadc Mon Sep 17 00:00:00 2001 From: Sylvester Hesp Date: Thu, 5 Jan 2023 12:35:01 +0100 Subject: [PATCH] Update to nightly-2022-12-18 This nightly includes a clippy fix that we need (https://github.com/rust-lang/rust-clippy/pull/10055) --- crates/rustc_codegen_spirv/build.rs | 4 ++-- .../src/builder/builder_methods.rs | 4 ++-- crates/rustc_codegen_spirv/src/builder/mod.rs | 4 ++++ rust-toolchain | 4 ++-- tests/ui/image/gather_err.stderr | 12 ++++-------- tests/ui/image/query/query_levels_err.stderr | 6 ++---- tests/ui/image/query/query_lod_err.stderr | 6 ++---- tests/ui/image/query/query_size_err.stderr | 6 ++---- tests/ui/image/query/query_size_lod_err.stderr | 6 ++---- 9 files changed, 22 insertions(+), 30 deletions(-) diff --git a/crates/rustc_codegen_spirv/build.rs b/crates/rustc_codegen_spirv/build.rs index c7b84faba3..ecd32240df 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-12-10" +channel = "nightly-2022-12-18" components = ["rust-src", "rustc-dev", "llvm-tools-preview"] -# commit_hash = dfe3fe710181738a2cb3060c23ec5efb3c68ca09"#; +# commit_hash = 0468a00ae3fd6ef1a6a0f9eaf637d7aa9e604acc"#; fn get_rustc_commit_hash() -> Result> { let rustc = std::env::var("RUSTC").unwrap_or_else(|_| String::from("rustc")); diff --git a/crates/rustc_codegen_spirv/src/builder/builder_methods.rs b/crates/rustc_codegen_spirv/src/builder/builder_methods.rs index 9e7c5cc8f8..663d90ec18 100644 --- a/crates/rustc_codegen_spirv/src/builder/builder_methods.rs +++ b/crates/rustc_codegen_spirv/src/builder/builder_methods.rs @@ -2065,11 +2065,11 @@ impl<'a, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'tcx> { } // These are used by everyone except msvc - fn cleanup_landing_pad(&mut self, _ty: Self::Type, _pers_fn: Self::Value) -> Self::Value { + fn cleanup_landing_pad(&mut self, _pers_fn: Self::Value) -> (Self::Value, Self::Value) { todo!() } - fn resume(&mut self, _exn: Self::Value) { + fn resume(&mut self, _exn0: Self::Value, _exn1: Self::Value) { todo!() } diff --git a/crates/rustc_codegen_spirv/src/builder/mod.rs b/crates/rustc_codegen_spirv/src/builder/mod.rs index 8768fe61fb..92769e9d28 100644 --- a/crates/rustc_codegen_spirv/src/builder/mod.rs +++ b/crates/rustc_codegen_spirv/src/builder/mod.rs @@ -447,4 +447,8 @@ impl<'tcx> TypeMembershipMethods<'tcx> for CodegenCx<'tcx> { fn typeid_metadata(&self, _typeid: String) -> Self::Value { todo!() } + + fn set_kcfi_type_metadata(&self, _function: Self::Function, _typeid: u32) { + // ignore + } } diff --git a/rust-toolchain b/rust-toolchain index e950da783e..930a1f1677 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-12-10" +channel = "nightly-2022-12-18" components = ["rust-src", "rustc-dev", "llvm-tools-preview"] -# commit_hash = dfe3fe710181738a2cb3060c23ec5efb3c68ca09 +# commit_hash = 0468a00ae3fd6ef1a6a0f9eaf637d7aa9e604acc # 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/image/gather_err.stderr b/tests/ui/image/gather_err.stderr index 9771aaf049..bede583318 100644 --- a/tests/ui/image/gather_err.stderr +++ b/tests/ui/image/gather_err.stderr @@ -1,10 +1,8 @@ error[E0277]: the trait bound `Image: HasGather` is not satisfied - --> $DIR/gather_err.rs:15:26 + --> $DIR/gather_err.rs:15:34 | 15 | let r1: glam::Vec4 = image1d.gather(*sampler, 0.0f32, 0); - | ^^^^^^^ ------ required by a bound introduced by this call - | | - | the trait `HasGather` is not implemented for `Image` + | ^^^^^^ the trait `HasGather` is not implemented for `Image` | = help: the following other types implement trait `HasGather`: Image @@ -17,12 +15,10 @@ note: required by a bound in `Image::::gather` error[E0277]: the trait bound `Image: HasGather` is not satisfied - --> $DIR/gather_err.rs:16:26 + --> $DIR/gather_err.rs:16:34 | 16 | let r2: glam::Vec4 = image3d.gather(*sampler, v3, 0); - | ^^^^^^^ ------ required by a bound introduced by this call - | | - | the trait `HasGather` is not implemented for `Image` + | ^^^^^^ the trait `HasGather` is not implemented for `Image` | = help: the following other types implement trait `HasGather`: Image diff --git a/tests/ui/image/query/query_levels_err.stderr b/tests/ui/image/query/query_levels_err.stderr index 8273721641..74bbe1645c 100644 --- a/tests/ui/image/query/query_levels_err.stderr +++ b/tests/ui/image/query/query_levels_err.stderr @@ -1,10 +1,8 @@ error[E0277]: the trait bound `Image: HasQueryLevels` is not satisfied - --> $DIR/query_levels_err.rs:12:15 + --> $DIR/query_levels_err.rs:12:21 | 12 | *output = image.query_levels(); - | ^^^^^ ------------ required by a bound introduced by this call - | | - | the trait `HasQueryLevels` is not implemented for `Image` + | ^^^^^^^^^^^^ the trait `HasQueryLevels` is not implemented for `Image` | = help: the following other types implement trait `HasQueryLevels`: Image diff --git a/tests/ui/image/query/query_lod_err.stderr b/tests/ui/image/query/query_lod_err.stderr index b2d4553f61..f969efa95a 100644 --- a/tests/ui/image/query/query_lod_err.stderr +++ b/tests/ui/image/query/query_lod_err.stderr @@ -1,10 +1,8 @@ error[E0277]: the trait bound `Image: HasQueryLevels` is not satisfied - --> $DIR/query_lod_err.rs:13:15 + --> $DIR/query_lod_err.rs:13:21 | 13 | *output = image.query_lod(*sampler, glam::Vec2::new(0.0, 1.0)); - | ^^^^^ --------- required by a bound introduced by this call - | | - | the trait `HasQueryLevels` is not implemented for `Image` + | ^^^^^^^^^ the trait `HasQueryLevels` is not implemented for `Image` | = help: the following other types implement trait `HasQueryLevels`: Image diff --git a/tests/ui/image/query/query_size_err.stderr b/tests/ui/image/query/query_size_err.stderr index c66d6e32f6..b113619b49 100644 --- a/tests/ui/image/query/query_size_err.stderr +++ b/tests/ui/image/query/query_size_err.stderr @@ -1,10 +1,8 @@ error[E0277]: the trait bound `Image: HasQuerySize` is not satisfied - --> $DIR/query_size_err.rs:12:15 + --> $DIR/query_size_err.rs:12:21 | 12 | *output = image.query_size(); - | ^^^^^ ---------- required by a bound introduced by this call - | | - | the trait `HasQuerySize` is not implemented for `Image` + | ^^^^^^^^^^ the trait `HasQuerySize` is not implemented for `Image` | = help: the following other types implement trait `HasQuerySize`: Image diff --git a/tests/ui/image/query/query_size_lod_err.stderr b/tests/ui/image/query/query_size_lod_err.stderr index 94af055d93..1435cdcedf 100644 --- a/tests/ui/image/query/query_size_lod_err.stderr +++ b/tests/ui/image/query/query_size_lod_err.stderr @@ -1,10 +1,8 @@ error[E0277]: the trait bound `Image: HasQuerySizeLod` is not satisfied - --> $DIR/query_size_lod_err.rs:12:15 + --> $DIR/query_size_lod_err.rs:12:21 | 12 | *output = image.query_size_lod(0); - | ^^^^^ -------------- required by a bound introduced by this call - | | - | the trait `HasQuerySizeLod` is not implemented for `Image` + | ^^^^^^^^^^^^^^ the trait `HasQuerySizeLod` is not implemented for `Image` | = help: the following other types implement trait `HasQuerySizeLod`: Image