Update to nightly-2022-12-18

oisyn · eddyb · commit 86d6042204e4 · 2023-01-05T14:50:13.000+02:00
This nightly includes a clippy fix that we need (rust-lang/rust-clippy#10055)
diff --git 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<String, Box<dyn Error>> {
     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
@@ -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
@@ -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
@@ -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
@@ -1,10 +1,8 @@
 error[E0277]: the trait bound `Image<f32, 0, 2, 0, 0, 1, 0>: 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<f32, 0, 2, 0, 0, 1, 0>`
+    |                                  ^^^^^^ the trait `HasGather` is not implemented for `Image<f32, 0, 2, 0, 0, 1, 0>`
     |
     = help: the following other types implement trait `HasGather`:
               Image<SampledType, 1, DEPTH, ARRAYED, 0, SAMPLED, FORMAT>
@@ -17,12 +15,10 @@ note: required by a bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, _, SAMPL
     |               ^^^^^^^^^ required by this bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, _, SAMPLED, FORMAT>::gather`
 
 error[E0277]: the trait bound `Image<f32, 2, 2, 0, 0, 1, 0>: 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<f32, 2, 2, 0, 0, 1, 0>`
+    |                                  ^^^^^^ the trait `HasGather` is not implemented for `Image<f32, 2, 2, 0, 0, 1, 0>`
     |
     = help: the following other types implement trait `HasGather`:
               Image<SampledType, 1, DEPTH, ARRAYED, 0, SAMPLED, FORMAT>
diff --git 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<f32, 4, 2, 0, 0, 1, 0>: 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<f32, 4, 2, 0, 0, 1, 0>`
+    |                     ^^^^^^^^^^^^ the trait `HasQueryLevels` is not implemented for `Image<f32, 4, 2, 0, 0, 1, 0>`
     |
     = help: the following other types implement trait `HasQueryLevels`:
               Image<SampledType, 0, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT>
diff --git 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<f32, 4, 2, 0, 0, 1, 0>: 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<f32, 4, 2, 0, 0, 1, 0>`
+    |                     ^^^^^^^^^ the trait `HasQueryLevels` is not implemented for `Image<f32, 4, 2, 0, 0, 1, 0>`
     |
     = help: the following other types implement trait `HasQueryLevels`:
               Image<SampledType, 0, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT>
diff --git 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<f32, 1, 2, 0, 0, 1, 0>: 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<f32, 1, 2, 0, 0, 1, 0>`
+    |                     ^^^^^^^^^^ the trait `HasQuerySize` is not implemented for `Image<f32, 1, 2, 0, 0, 1, 0>`
     |
     = help: the following other types implement trait `HasQuerySize`:
               Image<SampledType, 0, DEPTH, ARRAYED, 0, 0, FORMAT>
diff --git 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<f32, 4, 2, 0, 0, 1, 0>: 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<f32, 4, 2, 0, 0, 1, 0>`
+    |                     ^^^^^^^^^^^^^^ the trait `HasQuerySizeLod` is not implemented for `Image<f32, 4, 2, 0, 0, 1, 0>`
     |
     = help: the following other types implement trait `HasQuerySizeLod`:
               Image<SampledType, 0, DEPTH, ARRAYED, 0, SAMPLED, FORMAT>

Original file line number	Diff line number	Diff line change
`@@ -2065,11 +2065,11 @@ impl<'a, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'tcx> {`
`2065`	`2065`	`}`
`2066`	`2066`
`2067`	`2067`	`// These are used by everyone except msvc`
`2068`		`- fn cleanup_landing_pad(&mut self, _ty: Self::Type, _pers_fn: Self::Value) -> Self::Value {`
	`2068`	`+ fn cleanup_landing_pad(&mut self, _pers_fn: Self::Value) -> (Self::Value, Self::Value) {`
`2069`	`2069`	`todo!()`
`2070`	`2070`	`}`
`2071`	`2071`
`2072`		`- fn resume(&mut self, _exn: Self::Value) {`
	`2072`	`+ fn resume(&mut self, _exn0: Self::Value, _exn1: Self::Value) {`
`2073`	`2073`	`todo!()`
`2074`	`2074`	`}`
`2075`	`2075`
Original file line number	Diff line number	Diff line change
`@@ -447,4 +447,8 @@ impl<'tcx> TypeMembershipMethods<'tcx> for CodegenCx<'tcx> {`
`447`	`447`	`fn typeid_metadata(&self, _typeid: String) -> Self::Value {`
`448`	`448`	`todo!()`
`449`	`449`	`}`
	`450`	`+`
	`451`	`+ fn set_kcfi_type_metadata(&self, _function: Self::Function, _typeid: u32) {`
	`452`	`+ // ignore`
	`453`	`+ }`
`450`	`454`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,8 @@`
`1`	`1`	error[E0277]: the trait bound `Image<f32, 4, 2, 0, 0, 1, 0>: HasQueryLevels` is not satisfied
`2`		`- --> $DIR/query_levels_err.rs:12:15`
	`2`	`+ --> $DIR/query_levels_err.rs:12:21`
`3`	`3`	`\|`
`4`	`4`	`12 \| *output = image.query_levels();`
`5`		`- \| ^^^^^ ------------ required by a bound introduced by this call`
`6`		`- \| \|`
`7`		- \| the trait `HasQueryLevels` is not implemented for `Image<f32, 4, 2, 0, 0, 1, 0>`
	`5`	+ \| ^^^^^^^^^^^^ the trait `HasQueryLevels` is not implemented for `Image<f32, 4, 2, 0, 0, 1, 0>`
`8`	`6`	`\|`
`9`	`7`	= help: the following other types implement trait `HasQueryLevels`:
`10`	`8`	`Image<SampledType, 0, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT>`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,8 @@`
`1`	`1`	error[E0277]: the trait bound `Image<f32, 4, 2, 0, 0, 1, 0>: HasQueryLevels` is not satisfied
`2`		`- --> $DIR/query_lod_err.rs:13:15`
	`2`	`+ --> $DIR/query_lod_err.rs:13:21`
`3`	`3`	`\|`
`4`	`4`	`13 \| output = image.query_lod(sampler, glam::Vec2::new(0.0, 1.0));`
`5`		`- \| ^^^^^ --------- required by a bound introduced by this call`
`6`		`- \| \|`
`7`		- \| the trait `HasQueryLevels` is not implemented for `Image<f32, 4, 2, 0, 0, 1, 0>`
	`5`	+ \| ^^^^^^^^^ the trait `HasQueryLevels` is not implemented for `Image<f32, 4, 2, 0, 0, 1, 0>`
`8`	`6`	`\|`
`9`	`7`	= help: the following other types implement trait `HasQueryLevels`:
`10`	`8`	`Image<SampledType, 0, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT>`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,8 @@`
`1`	`1`	error[E0277]: the trait bound `Image<f32, 1, 2, 0, 0, 1, 0>: HasQuerySize` is not satisfied
`2`		`- --> $DIR/query_size_err.rs:12:15`
	`2`	`+ --> $DIR/query_size_err.rs:12:21`
`3`	`3`	`\|`
`4`	`4`	`12 \| *output = image.query_size();`
`5`		`- \| ^^^^^ ---------- required by a bound introduced by this call`
`6`		`- \| \|`
`7`		- \| the trait `HasQuerySize` is not implemented for `Image<f32, 1, 2, 0, 0, 1, 0>`
	`5`	+ \| ^^^^^^^^^^ the trait `HasQuerySize` is not implemented for `Image<f32, 1, 2, 0, 0, 1, 0>`
`8`	`6`	`\|`
`9`	`7`	= help: the following other types implement trait `HasQuerySize`:
`10`	`8`	`Image<SampledType, 0, DEPTH, ARRAYED, 0, 0, FORMAT>`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,8 @@`
`1`	`1`	error[E0277]: the trait bound `Image<f32, 4, 2, 0, 0, 1, 0>: HasQuerySizeLod` is not satisfied
`2`		`- --> $DIR/query_size_lod_err.rs:12:15`
	`2`	`+ --> $DIR/query_size_lod_err.rs:12:21`
`3`	`3`	`\|`
`4`	`4`	`12 \| *output = image.query_size_lod(0);`
`5`		`- \| ^^^^^ -------------- required by a bound introduced by this call`
`6`		`- \| \|`
`7`		- \| the trait `HasQuerySizeLod` is not implemented for `Image<f32, 4, 2, 0, 0, 1, 0>`
	`5`	+ \| ^^^^^^^^^^^^^^ the trait `HasQuerySizeLod` is not implemented for `Image<f32, 4, 2, 0, 0, 1, 0>`
`8`	`6`	`\|`
`9`	`7`	= help: the following other types implement trait `HasQuerySizeLod`:
`10`	`8`	`Image<SampledType, 0, DEPTH, ARRAYED, 0, SAMPLED, FORMAT>`