rustc_codegen_spirv: switch to Rust 2024 edition.

Author: eddyb

crates/rustc_codegen_spirv/Cargo.toml

@@ -4,7 +4,7 @@ description = "SPIR-V code generator backend for rustc"
 documentation = "https://rust-gpu.github.io/rust-gpu/api/rustc_codegen_spirv/index.html"
 version.workspace = true
 authors.workspace = true
-edition.workspace = true
+edition = "2024"
 license.workspace = true
 repository.workspace = true
 

crates/rustc_codegen_spirv/src/codegen_cx/mod.rs

@@ -690,10 +690,10 @@ impl CodegenArgs {
                 *current_id = *remap.entry(*current_id).or_insert_with(|| len as u32 + 1);
             };
             module.all_inst_iter_mut().for_each(|inst| {
-                if let Some(ref mut result_id) = &mut inst.result_id {
+                if let Some(result_id) = &mut inst.result_id {
                     insert(result_id);
                 }
-                if let Some(ref mut result_type) = &mut inst.result_type {
+                if let Some(result_type) = &mut inst.result_type {
                     insert(result_type);
                 }
                 inst.operands.iter_mut().for_each(|op| {

crates/rustc_codegen_spirv/src/custom_insts.rs

@@ -117,7 +117,7 @@ macro_rules! def_custom_insts {
             pub fn with_operands<T: Clone>(self, operands: &[T]) -> CustomInst<T> {
                 match self {
                     $(Self::$name => match operands {
-                        [$($($field,)+ $(ref $variadic_field @ ..)?)?] => CustomInst::$name $({
+                        [$($($field,)+ $($variadic_field @ ..)?)?] => CustomInst::$name $({
                             $($field: $field.clone(),)+
                             $($variadic_field: $variadic_field.iter().cloned().collect())?
                         })?,

crates/rustc_codegen_spirv/src/lib.rs

@@ -500,7 +500,7 @@ impl Drop for DumpModuleOnPanic<'_, '_, '_> {
 }
 
 /// This is the entrypoint for a hot plugged `rustc_codegen_spirv`
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub fn __rustc_codegen_backend() -> Box<dyn CodegenBackend> {
     // Tweak rustc's default ICE panic hook, to direct people to `rust-gpu`.
     rustc_driver::install_ice_hook("https://github.com/rust-gpu/rust-gpu/issues/new", |dcx| {

crates/rustc_codegen_spirv/src/linker/import_export_link.rs

@@ -202,7 +202,7 @@ fn check_tys_equal(
 
 fn replace_all_uses_with(module: &mut Module, rules: &FxHashMap<u32, u32>) {
     module.all_inst_iter_mut().for_each(|inst| {
-        if let Some(ref mut result_type) = &mut inst.result_type {
+        if let Some(result_type) = &mut inst.result_type {
             if let Some(&rewrite) = rules.get(result_type) {
                 *result_type = rewrite;
             }

crates/rustc_codegen_spirv/src/linker/simple_passes.rs

@@ -28,11 +28,11 @@ fn capability_for_float_width(width: u32) -> Option<rspirv::spirv::Capability> {
 
 pub fn shift_ids(module: &mut Module, add: u32) {
     module.all_inst_iter_mut().for_each(|inst| {
-        if let Some(ref mut result_id) = &mut inst.result_id {
+        if let Some(result_id) = &mut inst.result_id {
             *result_id += add;
         }
 
-        if let Some(ref mut result_type) = &mut inst.result_type {
+        if let Some(result_type) = &mut inst.result_type {
             *result_type += add;
         }
 
@@ -130,11 +130,11 @@ pub fn compact_ids(module: &mut Module) -> u32 {
     };
 
     module.all_inst_iter_mut().for_each(|inst| {
-        if let Some(ref mut result_id) = &mut inst.result_id {
+        if let Some(result_id) = &mut inst.result_id {
             *result_id = insert(*result_id);
         }
 
-        if let Some(ref mut result_type) = &mut inst.result_type {
+        if let Some(result_type) = &mut inst.result_type {
             *result_type = insert(*result_type);
         }
 

crates/rustc_codegen_spirv/src/linker/spirt_passes/diagnostics.rs

@@ -389,15 +389,15 @@ impl DiagnosticReporter<'_> {
             .split_last()
             .filter(
                 |(
-                    &UseOrigin::Global {
+                    UseOrigin::Global {
                         attrs: use_attrs, ..
                     }
-                    | &UseOrigin::IntraFunc {
+                    | UseOrigin::IntraFunc {
                         func_attrs: use_attrs,
                         ..
                     },
                     _,
-                )| { use_attrs == attrs },
+                )| *use_attrs == attrs,
             )
             .map_or((None, &self.use_stack[..]), |(current, stack)| {
                 (Some(current), stack)