nordic-dev.net/rust-gpu
2
0
Fork 0
mirror of https://github.com/EmbarkStudios/rust-gpu.git synced 2024-11-26 00:34:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to nightly-2022-09-10

Browse Source
This commit is contained in:
Sylvester Hesp 2022-10-26 18:06:13 +02:00 committed by Eduard-Mihai Burtescu
parent 932cd1d173
commit 64b159257e
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crates/rustc_codegen_spirv/build.rs
View File

@ -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 :/ /// `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 = include_str!("../../rust-toolchain");
const REQUIRED_RUST_TOOLCHAIN: &str = r#"[toolchain] const REQUIRED_RUST_TOOLCHAIN: &str = r#"[toolchain]
channel = "nightly-2022-09-06" channel = "nightly-2022-09-10"
components = ["rust-src", "rustc-dev", "llvm-tools-preview"] components = ["rust-src", "rustc-dev", "llvm-tools-preview"]
# commit_hash = b44197abb0b3ffe4908892e1e08ab1cd721ff3b9"#; # commit_hash = 1d37ed661a6922e7a167609b8cd7eb31e972b19b"#;
fn get_rustc_commit_hash() -> Result<String, Box<dyn Error>> { fn get_rustc_commit_hash() -> Result<String, Box<dyn Error>> {
let rustc = std::env::var("RUSTC").unwrap_or_else(|_| String::from("rustc")); let rustc = std::env::var("RUSTC").unwrap_or_else(|_| String::from("rustc"));
@ -45,7 +45,9 @@ fn check_toolchain_version() -> Result<(), Box<dyn Error>> {
} }
} }
if !cfg!(feature = "skip-toolchain-check") { if !cfg!(feature = "skip-toolchain-check")
&& !std::env::var("RUSTGPU_SKIP_TOOLCHAIN_CHECK").is_ok()
{
// check if our current rustc's commit hash matches with what we expect it to be // check if our current rustc's commit hash matches with what we expect it to be
let current_hash = get_rustc_commit_hash()?; let current_hash = get_rustc_commit_hash()?;
let required_hash = get_required_commit_hash()?; let required_hash = get_required_commit_hash()?;

4
crates/rustc_codegen_spirv/src/abi.rs
View File

@ -128,11 +128,11 @@ pub(crate) fn provide(providers: &mut Providers) {
tag_encoding: match *tag_encoding { tag_encoding: match *tag_encoding {
TagEncoding::Direct => TagEncoding::Direct, TagEncoding::Direct => TagEncoding::Direct,
TagEncoding::Niche { TagEncoding::Niche {
dataful_variant, untagged_variant,
ref niche_variants, ref niche_variants,
niche_start, niche_start,
} => TagEncoding::Niche { } => TagEncoding::Niche {
dataful_variant, untagged_variant,
niche_variants: niche_variants.clone(), niche_variants: niche_variants.clone(),
niche_start, niche_start,
}, },

4
crates/rustc_codegen_spirv/src/codegen_cx/constant.rs
View File

@ -331,10 +331,6 @@ impl<'tcx> ConstMethods<'tcx> for CodegenCx<'tcx> {
} }
} }
fn zst_to_backend(&self, _llty: Self::Type) -> Self::Value {
unreachable!();
}
// FIXME(eddyb) this shouldn't exist, and is only used by vtable creation, // FIXME(eddyb) this shouldn't exist, and is only used by vtable creation,
// see https://github.com/rust-lang/rust/pull/86475#discussion_r680792727. // see https://github.com/rust-lang/rust/pull/86475#discussion_r680792727.
fn const_data_from_alloc(&self, _alloc: ConstAllocation<'tcx>) -> Self::Value { fn const_data_from_alloc(&self, _alloc: ConstAllocation<'tcx>) -> Self::Value {

4
rust-toolchain
View File

@ -5,9 +5,9 @@
# to the user in the error, instead of "error: invalid channel name '[toolchain]'". # to the user in the error, instead of "error: invalid channel name '[toolchain]'".
[toolchain] [toolchain]
channel = "nightly-2022-09-06" channel = "nightly-2022-09-10"
components = ["rust-src", "rustc-dev", "llvm-tools-preview"] components = ["rust-src", "rustc-dev", "llvm-tools-preview"]
# commit_hash = b44197abb0b3ffe4908892e1e08ab1cd721ff3b9 # commit_hash = 1d37ed661a6922e7a167609b8cd7eb31e972b19b
# Whenever changing the nightly channel, update the commit hash above, and make # 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. # sure to change REQUIRED_TOOLCHAIN in crates/rustc_codegen_spirv/src/build.rs also.