More tweaks to accomodate recent rustc changes

Author: dvdplm

crates/rustc_codegen_spirv/src/builder/builder_methods.rs

@@ -1920,6 +1920,7 @@ impl<'a, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'tcx> {
         OperandRef {
             val,
             layout: place.layout,
+            move_annotation: None,
         }
     }
 

crates/rustc_codegen_spirv/src/builder/mod.rs

@@ -173,7 +173,7 @@ impl<'a, 'tcx> CoverageInfoBuilderMethods<'tcx> for Builder<'a, 'tcx> {
     fn add_coverage(&mut self, _instance: Instance<'tcx>, _kind: &CoverageKind) {}
 }
 
-impl<'a, 'tcx> DebugInfoBuilderMethods for Builder<'a, 'tcx> {
+impl<'a, 'tcx> DebugInfoBuilderMethods<'_> for Builder<'a, 'tcx> {
     fn dbg_var_addr(
         &mut self,
         _dbg_var: Self::DIVariable,

crates/rustc_codegen_spirv/src/target.rs

@@ -1,5 +1,5 @@
 use rspirv::spirv::MemoryModel;
-use rustc_target::spec::{Cc, LinkerFlavor, PanicStrategy, Target, TargetOptions};
+use rustc_target::spec::{Cc, LinkerFlavor, PanicStrategy, Target, TargetOptions, Arch};
 use spirv_tools::TargetEnv;
 
 const ARCH: &str = "spirv";
@@ -74,7 +74,7 @@ impl SpirvTarget {
             metadata: Default::default(),
             pointer_width: 32,
             data_layout: "e-m:e-p:32:32:32-i64:64-n8:16:32:64".into(),
-            arch: ARCH.into(),
+            arch: Arch::Unknown(ARCH.into()),
             options: self.init_target_opts(),
         }
     }