Skip to content

Commit 86d6042

Browse files
oisyneddyb
oisyn
authored and
eddyb
committed
Update to nightly-2022-12-18
This nightly includes a clippy fix that we need (rust-lang/rust-clippy#10055)
1 parent 87dc07c commit 86d6042

File tree

9 files changed

+22
-30
lines changed

9 files changed

+22
-30
lines changed

‎crates/rustc_codegen_spirv/build.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ use std::process::{Command, ExitCode};
1010
/// `cargo publish`. We need to figure out a way to do this properly, but let's hardcode it for now :/
1111
//const REQUIRED_RUST_TOOLCHAIN: &str = include_str!("../../rust-toolchain");
1212
const REQUIRED_RUST_TOOLCHAIN: &str = r#"[toolchain]
13-
channel = "nightly-2022-12-10"
13+
channel = "nightly-2022-12-18"
1414
components = ["rust-src", "rustc-dev", "llvm-tools-preview"]
15-
# commit_hash = dfe3fe710181738a2cb3060c23ec5efb3c68ca09"#;
15+
# commit_hash = 0468a00ae3fd6ef1a6a0f9eaf637d7aa9e604acc"#;
1616

1717
fn get_rustc_commit_hash() -> Result<String, Box<dyn Error>> {
1818
let rustc = std::env::var("RUSTC").unwrap_or_else(|_| String::from("rustc"));

‎crates/rustc_codegen_spirv/src/builder/builder_methods.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2065,11 +2065,11 @@ impl<'a, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'tcx> {
20652065
}
20662066

20672067
// 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) {
20692069
todo!()
20702070
}
20712071

2072-
fn resume(&mut self, _exn: Self::Value) {
2072+
fn resume(&mut self, _exn0: Self::Value, _exn1: Self::Value) {
20732073
todo!()
20742074
}
20752075

‎crates/rustc_codegen_spirv/src/builder/mod.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -447,4 +447,8 @@ impl<'tcx> TypeMembershipMethods<'tcx> for CodegenCx<'tcx> {
447447
fn typeid_metadata(&self, _typeid: String) -> Self::Value {
448448
todo!()
449449
}
450+
451+
fn set_kcfi_type_metadata(&self, _function: Self::Function, _typeid: u32) {
452+
// ignore
453+
}
450454
}

‎rust-toolchain

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
# to the user in the error, instead of "error: invalid channel name '[toolchain]'".
66

77
[toolchain]
8-
channel = "nightly-2022-12-10"
8+
channel = "nightly-2022-12-18"
99
components = ["rust-src", "rustc-dev", "llvm-tools-preview"]
10-
# commit_hash = dfe3fe710181738a2cb3060c23ec5efb3c68ca09
10+
# commit_hash = 0468a00ae3fd6ef1a6a0f9eaf637d7aa9e604acc
1111

1212
# Whenever changing the nightly channel, update the commit hash above, and make
1313
# sure to change REQUIRED_TOOLCHAIN in crates/rustc_codegen_spirv/src/build.rs also.

‎tests/ui/image/gather_err.stderr

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
error[E0277]: the trait bound `Image<f32, 0, 2, 0, 0, 1, 0>: HasGather` is not satisfied
2-
--> $DIR/gather_err.rs:15:26
2+
--> $DIR/gather_err.rs:15:34
33
|
44
15 | let r1: glam::Vec4 = image1d.gather(*sampler, 0.0f32, 0);
5-
| ^^^^^^^ ------ required by a bound introduced by this call
6-
| |
7-
| the trait `HasGather` is not implemented for `Image<f32, 0, 2, 0, 0, 1, 0>`
5+
| ^^^^^^ the trait `HasGather` is not implemented for `Image<f32, 0, 2, 0, 0, 1, 0>`
86
|
97
= help: the following other types implement trait `HasGather`:
108
Image<SampledType, 1, DEPTH, ARRAYED, 0, SAMPLED, FORMAT>
@@ -17,12 +15,10 @@ note: required by a bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, _, SAMPL
1715
| ^^^^^^^^^ required by this bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, _, SAMPLED, FORMAT>::gather`
1816

1917
error[E0277]: the trait bound `Image<f32, 2, 2, 0, 0, 1, 0>: HasGather` is not satisfied
20-
--> $DIR/gather_err.rs:16:26
18+
--> $DIR/gather_err.rs:16:34
2119
|
2220
16 | let r2: glam::Vec4 = image3d.gather(*sampler, v3, 0);
23-
| ^^^^^^^ ------ required by a bound introduced by this call
24-
| |
25-
| the trait `HasGather` is not implemented for `Image<f32, 2, 2, 0, 0, 1, 0>`
21+
| ^^^^^^ the trait `HasGather` is not implemented for `Image<f32, 2, 2, 0, 0, 1, 0>`
2622
|
2723
= help: the following other types implement trait `HasGather`:
2824
Image<SampledType, 1, DEPTH, ARRAYED, 0, SAMPLED, FORMAT>

‎tests/ui/image/query/query_levels_err.stderr

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
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
33
|
44
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>`
86
|
97
= help: the following other types implement trait `HasQueryLevels`:
108
Image<SampledType, 0, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT>

‎tests/ui/image/query/query_lod_err.stderr

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
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
33
|
44
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>`
86
|
97
= help: the following other types implement trait `HasQueryLevels`:
108
Image<SampledType, 0, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT>

‎tests/ui/image/query/query_size_err.stderr

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
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
33
|
44
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>`
86
|
97
= help: the following other types implement trait `HasQuerySize`:
108
Image<SampledType, 0, DEPTH, ARRAYED, 0, 0, FORMAT>

‎tests/ui/image/query/query_size_lod_err.stderr

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
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
33
|
44
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>`
86
|
97
= help: the following other types implement trait `HasQuerySizeLod`:
108
Image<SampledType, 0, DEPTH, ARRAYED, 0, SAMPLED, FORMAT>

0 commit comments

Comments
 (0)