cargo-gpu merge: upgrade cargo-gpu to edition 2024

Author: Firestar99

crates/cargo-gpu-install/src/install.rs

@@ -1,7 +1,7 @@
 //! Install a dedicated per-shader crate that has the `rust-gpu` compiler in it.
 
 use crate::spirv_source::{
-    get_channel_from_rustc_codegen_spirv_build_script, query_metadata, FindPackage as _,
+    FindPackage as _, get_channel_from_rustc_codegen_spirv_build_script, query_metadata,
 };
 use crate::{cache_dir, spirv_source::SpirvSource};
 use anyhow::Context as _;

crates/cargo-gpu/src/dump_usage.rs

@@ -1,7 +1,7 @@
 //! Convenience function for internal use. Dumps all the CLI usage instructions. Useful for
 //! updating the README.
 
-use crate::{user_output, Cli};
+use crate::{Cli, user_output};
 
 /// main dump usage function
 pub fn dump_full_usage_for_readme() -> anyhow::Result<()> {

crates/cargo-gpu/src/main.rs

@@ -3,8 +3,11 @@ use cargo_gpu::Cli;
 use clap::Parser as _;
 
 fn main() {
+    // Safety: always in single-threaded code
     #[cfg(debug_assertions)]
-    std::env::set_var("RUST_BACKTRACE", "1");
+    unsafe {
+        std::env::set_var("RUST_BACKTRACE", "1");
+    }
 
     env_logger::builder().init();
 

crates/xtask/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "xtask"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 anyhow.workspace = true

crates/xtask/src/main.rs

@@ -244,10 +244,10 @@ impl DependencyVersion {
     pub fn modify_toml(&self, toml: &mut toml::Value) {
         if let Some(mut table) = self.to_toml() {
             let mut copy = |key: &str| {
-                if let Some(src_table) = toml.as_table_mut() {
-                    if let Some(value) = src_table.remove(key) {
-                        table.insert(key.to_owned(), value);
-                    }
+                if let Some(src_table) = toml.as_table_mut()
+                    && let Some(value) = src_table.remove(key)
+                {
+                    table.insert(key.to_owned(), value);
                 }
             };
             copy("default-features");