diff --git a/CHANGELOG.md b/CHANGELOG.md index 81d5f9bc90..2c77c2f75f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,7 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed 🛠 - [PR#1112](https://github.com/EmbarkStudios/rust-gpu/pull/1112) updated wgpu and winit in example runners -- [PR#1109](https://github.com/EmbarkStudios/rust-gpu/pull/1109) updated toolchain to `nightly-2023-12-31` +- [PR#1109](https://github.com/EmbarkStudios/rust-gpu/pull/1109) updated toolchain to `nightly-2024-01-08` - [PR#1100](https://github.com/EmbarkStudios/rust-gpu/pull/1100) updated toolchain to `nightly-2023-09-30` - [PR#1091](https://github.com/EmbarkStudios/rust-gpu/pull/1091) updated toolchain to `nightly-2023-08-29` - [PR#1085](https://github.com/EmbarkStudios/rust-gpu/pull/1085) updated toolchain to `nightly-2023-07-08` diff --git a/crates/rustc_codegen_spirv/build.rs b/crates/rustc_codegen_spirv/build.rs index 432e3a6dab..fecbfa736f 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.toml"); const REQUIRED_RUST_TOOLCHAIN: &str = r#"[toolchain] -channel = "nightly-2023-12-31" +channel = "nightly-2024-01-08" components = ["rust-src", "rustc-dev", "llvm-tools"] -# commit_hash = 2a3e63551fe21458637480a97b65a2d15dec8062"#; +# commit_hash = 75c68cfd2b9870f2953b62d250bd7d0564a7b56d"#; 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/custom_decorations.rs b/crates/rustc_codegen_spirv/src/custom_decorations.rs index 90844487d6..af74b98980 100644 --- a/crates/rustc_codegen_spirv/src/custom_decorations.rs +++ b/crates/rustc_codegen_spirv/src/custom_decorations.rs @@ -158,8 +158,8 @@ impl<'a> CustomDecoration<'a> for SrcLocDecoration<'a> { } fn decode(s: &'a str) -> Self { #[derive(Copy, Clone, Debug)] - struct InvalidSrcLoc<'a>(&'a str); - let err = InvalidSrcLoc(s); + struct InvalidSrcLoc; + let err = InvalidSrcLoc; let (s, col_end) = s.rsplit_once(':').ok_or(err).unwrap(); let (s, line_end) = s.rsplit_once('-').ok_or(err).unwrap(); diff --git a/crates/rustc_codegen_spirv/src/link.rs b/crates/rustc_codegen_spirv/src/link.rs index 77c6b5ca01..0c2d4e38c1 100644 --- a/crates/rustc_codegen_spirv/src/link.rs +++ b/crates/rustc_codegen_spirv/src/link.rs @@ -350,7 +350,7 @@ fn do_spirv_opt( // Level::Error | Level::Fatal | Level::InternalError => DiagnosticBuilder::<()>::new( sess.dcx(), - rustc_errors::Level::Error { lint: false }, + rustc_errors::Level::Error, msg.message, ), Level::Warning => sess.dcx().struct_warn(msg.message), diff --git a/crates/rustc_codegen_spirv/src/linker/specializer.rs b/crates/rustc_codegen_spirv/src/linker/specializer.rs index 3fb003b4b1..73f2fe97a1 100644 --- a/crates/rustc_codegen_spirv/src/linker/specializer.rs +++ b/crates/rustc_codegen_spirv/src/linker/specializer.rs @@ -234,7 +234,7 @@ enum CopyOperand { } #[derive(Debug)] -struct NotSupportedAsCopyOperand(Operand); +struct NotSupportedAsCopyOperand; impl TryFrom<&Operand> for CopyOperand { type Error = NotSupportedAsCopyOperand; @@ -242,7 +242,7 @@ impl TryFrom<&Operand> for CopyOperand { match *operand { Operand::IdRef(id) => Ok(Self::IdRef(id)), Operand::StorageClass(s) => Ok(Self::StorageClass(s)), - _ => Err(NotSupportedAsCopyOperand(operand.clone())), + _ => Err(NotSupportedAsCopyOperand), } } } diff --git a/crates/rustc_codegen_spirv/src/linker/test.rs b/crates/rustc_codegen_spirv/src/linker/test.rs index b3c2e5fd81..3ed1bf0c7f 100644 --- a/crates/rustc_codegen_spirv/src/linker/test.rs +++ b/crates/rustc_codegen_spirv/src/linker/test.rs @@ -169,7 +169,7 @@ fn link_with_linker_opts( ) }; let emitter = - rustc_errors::emitter::EmitterWriter::new(Box::new(buf), fallback_bundle) + rustc_errors::emitter::HumanEmitter::new(Box::new(buf), fallback_bundle) .sm(Some(sess.parse_sess.clone_source_map())); rustc_errors::DiagCtxt::with_emitter(Box::new(emitter)) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 8a89005026..5933e8a961 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,7 +1,7 @@ [toolchain] -channel = "nightly-2023-12-31" +channel = "nightly-2024-01-08" components = ["rust-src", "rustc-dev", "llvm-tools"] -# commit_hash = 2a3e63551fe21458637480a97b65a2d15dec8062 +# commit_hash = 75c68cfd2b9870f2953b62d250bd7d0564a7b56d # Whenever changing the nightly channel, update the commit hash above, and make # sure to change `REQUIRED_TOOLCHAIN` in `crates/rustc_codegen_spirv/build.rs` also.