Skip to content

Commit 9114d74

Browse files
committed
update to nightly-2025-08-06, failing
1 parent c5b40b2 commit 9114d74

6 files changed

Lines changed: 142 additions & 109 deletions

File tree

crates/rustc_codegen_spirv/build.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ use std::{env, fs, mem};
1919
/// `cargo publish`. We need to figure out a way to do this properly, but let's hardcode it for now :/
2020
//const REQUIRED_RUST_TOOLCHAIN: &str = include_str!("../../rust-toolchain.toml");
2121
const REQUIRED_RUST_TOOLCHAIN: &str = r#"[toolchain]
22-
channel = "nightly-2026-07-19"
22+
channel = "nightly-2026-08-06"
2323
components = ["rust-src", "rustc-dev", "llvm-tools"]
24-
# commit_hash = eff8269f797067c30555e77f160ec84c0ed15cd9"#;
24+
# commit_hash = 7608eb7b07eaf93f16d7cf5bcb2098eca87503df"#;
2525

2626
fn rustc_output(arg: &str) -> Result<String, Box<dyn Error>> {
2727
let rustc = env::var("RUSTC").unwrap_or_else(|_| "rustc".into());

crates/rustc_codegen_spirv/src/abi.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ impl<'tcx> ConvSpirvType<'tcx> for TyAndLayout<'tcx> {
441441
let elem_spirv = trans_scalar(cx, span, *self, element, Size::ZERO);
442442
SpirvType::Vector {
443443
element: elem_spirv,
444-
count: count as u32,
444+
count: count.as_u32(),
445445
size: self.size,
446446
align: self.align.abi,
447447
}

crates/rustc_codegen_spirv/src/attr.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -433,19 +433,19 @@ impl<'tcx> Visitor<'tcx> for CheckSpirvAttrVisitor<'tcx> {
433433
}
434434

435435
fn visit_item(&mut self, item: &'tcx hir::Item<'tcx>) {
436-
let target = Target::from_item(item);
436+
let target = Target::from(item);
437437
self.check_spirv_attributes(item.hir_id(), target);
438438
intravisit::walk_item(self, item);
439439
}
440440

441441
fn visit_generic_param(&mut self, generic_param: &'tcx hir::GenericParam<'tcx>) {
442-
let target = Target::from_generic_param(generic_param);
442+
let target = Target::from(generic_param);
443443
self.check_spirv_attributes(generic_param.hir_id, target);
444444
intravisit::walk_generic_param(self, generic_param);
445445
}
446446

447447
fn visit_trait_item(&mut self, trait_item: &'tcx hir::TraitItem<'tcx>) {
448-
let target = Target::from_trait_item(trait_item);
448+
let target = Target::from(trait_item);
449449
self.check_spirv_attributes(trait_item.hir_id(), target);
450450
intravisit::walk_trait_item(self, trait_item);
451451
}
@@ -461,7 +461,7 @@ impl<'tcx> Visitor<'tcx> for CheckSpirvAttrVisitor<'tcx> {
461461
}
462462

463463
fn visit_foreign_item(&mut self, f_item: &'tcx hir::ForeignItem<'tcx>) {
464-
let target = Target::from_foreign_item(f_item);
464+
let target = Target::from(f_item);
465465
self.check_spirv_attributes(f_item.hir_id(), target);
466466
intravisit::walk_foreign_item(self, f_item);
467467
}

0 commit comments

Comments
 (0)