update rspirv: fix clippy lints

EmbarkStudios · Jan 23, 2024 · 19b955b · 19b955b
1 parent 2a3dbcb
commit 19b955b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/crates/rustc_codegen_spirv/src/builder/spirv_asm.rs b/crates/rustc_codegen_spirv/src/builder/spirv_asm.rs
@@ -1412,7 +1412,7 @@ impl<'cx, 'tcx> Builder<'cx, 'tcx> {
                 Ok(x) => inst.operands.push(dr::Operand::StoreCacheControl(x)),
                 Err(()) => self.err(format!("unknown StoreCacheControl {word}")),
             },
-            (OperandKind::LiteralFloat, Some(word)) => todo!(),
+            (OperandKind::LiteralFloat, Some(_word)) => todo!(),
             (kind, None) => match token {
                 Token::Word(_) => bug!(),
                 Token::String(_) => {

diff --git a/crates/rustc_codegen_spirv/src/builder_spirv.rs b/crates/rustc_codegen_spirv/src/builder_spirv.rs
@@ -583,10 +583,8 @@ impl<'tcx> BuilderSpirv<'tcx> {
         }
         let val = val_with_type.val;
         let id = match val {
-            SpirvConst::U32(v) => builder.constant_bit32(ty, v),
-            SpirvConst::U64(v) => builder.constant_bit64(ty, v),
-            SpirvConst::F32(v) => builder.constant_bit32(ty, v),
-            SpirvConst::F64(v) => builder.constant_bit64(ty, v),
+            SpirvConst::U32(v) | SpirvConst::F32(v) => builder.constant_bit32(ty, v),
+            SpirvConst::U64(v) | SpirvConst::F64(v) => builder.constant_bit64(ty, v),
             SpirvConst::Bool(v) => {
                 if v {
                     builder.constant_true(ty)