Update various crates from edition 2021 to 2024.

nnethercote · LegNeato · commit 61f40ed8ca5a · 2025-12-09T21:32:21.000-08:00
Three kinds of changes are required.
- Unsafe operations within unsafe functions now need to be explicitly
  marked with `unsafe`.
- `#[no_mangle]` now must be `#[unsafe(no_mangle)]`.
- `gen` is now a keyword.
- `cargo fmt` formats some things slightly different in edition 2024.
- `env::set_var` is now unsafe.
- Clippy wants nested `if`s to be chained where possible.
diff --git a/crates/cuda_builder/Cargo.toml b/crates/cuda_builder/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "cuda_builder"
 version = "0.3.0"
-edition = "2021"
+edition = "2024"
 authors = ["Riccardo D'Ambrosio <rdambrosio016@gmail.com>", "The rust-gpu Authors"]
 license = "MIT OR Apache-2.0"
 description = "Builder for easily building rustc_codegen_nvvm crates"
diff --git a/crates/cuda_builder/src/lib.rs b/crates/cuda_builder/src/lib.rs
@@ -469,12 +469,11 @@ fn find_in_dir(dir: &Path, filename: &str) -> Option<PathBuf> {
                 continue;
             }
 
-            if let Some(name) = path.file_name().and_then(|s| s.to_str()) {
-                if (name == filename)
-                    || (name.starts_with(&hashed_prefix) && name.ends_with(dll_suffix))
-                {
-                    return Some(path);
-                }
+            if let Some(name) = path.file_name().and_then(|s| s.to_str())
+                && (name == filename
+                    || (name.starts_with(&hashed_prefix) && name.ends_with(dll_suffix)))
+            {
+                return Some(path);
             }
         }
     }
@@ -580,12 +579,11 @@ fn workspace_root_dir() -> Option<PathBuf> {
 
     loop {
         let candidate = path.join("Cargo.toml");
-        if candidate.is_file() {
-            if let Ok(contents) = fs::read_to_string(&candidate) {
-                if contents.contains("[workspace]") {
-                    return Some(path.clone());
-                }
-            }
+        if candidate.is_file()
+            && let Ok(contents) = fs::read_to_string(&candidate)
+            && contents.contains("[workspace]")
+        {
+            return Some(path.clone());
         }
 
         if !path.pop() {
diff --git a/crates/cuda_std_macros/Cargo.toml b/crates/cuda_std_macros/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "cuda_std_macros"
 version = "0.2.0"
-edition = "2021"
+edition = "2024"
 license = "MIT OR Apache-2.0"
 description = "Macros for cuda_std"
 repository = "https://github.com/Rust-GPU/rust-cuda"
diff --git a/crates/cuda_std_macros/src/lib.rs b/crates/cuda_std_macros/src/lib.rs
@@ -1,9 +1,9 @@
 use proc_macro::TokenStream;
 use proc_macro2::Span;
-use quote::{quote_spanned, ToTokens};
+use quote::{ToTokens, quote_spanned};
 use syn::{
-    parse::Parse, parse_macro_input, parse_quote, punctuated::Punctuated, spanned::Spanned, Error,
-    FnArg, Ident, ItemFn, ReturnType, Stmt, Token,
+    Error, FnArg, Ident, ItemFn, ReturnType, Stmt, Token, parse::Parse, parse_macro_input,
+    parse_quote, punctuated::Punctuated, spanned::Spanned,
 };
 
 /// Registers a function as a gpu kernel.
@@ -25,7 +25,7 @@ pub fn kernel(input: proc_macro::TokenStream, item: proc_macro::TokenStream) ->
     let _ = parse_macro_input!(input as KernelHints);
     let input = parse_macro_input!(cloned as proc_macro2::TokenStream);
     let mut item = parse_macro_input!(item as ItemFn);
-    let no_mangle = parse_quote!(#[no_mangle]);
+    let no_mangle = parse_quote!(#[unsafe(no_mangle)]);
     item.attrs.push(no_mangle);
     let internal = parse_quote!(#[cfg_attr(target_arch="nvptx64", nvvm_internal::kernel(#input))]);
     item.attrs.push(internal);
diff --git a/crates/cust_core/Cargo.toml b/crates/cust_core/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "cust_core"
 version = "0.1.1"
-edition = "2021"
+edition = "2024"
 license = "MIT OR Apache-2.0"
 description = "Core library for cust that can be shared across CPU and GPU"
 repository = "https://github.com/Rust-GPU/rust-cuda"
diff --git a/crates/cust_core/src/lib.rs b/crates/cust_core/src/lib.rs
@@ -108,36 +108,36 @@ pub mod _hidden {
     {
     }
     unsafe impl<
-            A: DeviceCopy,
-            B: DeviceCopy,
-            C: DeviceCopy,
-            D: DeviceCopy,
-            E: DeviceCopy,
-            F: DeviceCopy,
-        > DeviceCopy for (A, B, C, D, E, F)
+        A: DeviceCopy,
+        B: DeviceCopy,
+        C: DeviceCopy,
+        D: DeviceCopy,
+        E: DeviceCopy,
+        F: DeviceCopy,
+    > DeviceCopy for (A, B, C, D, E, F)
     {
     }
     unsafe impl<
-            A: DeviceCopy,
-            B: DeviceCopy,
-            C: DeviceCopy,
-            D: DeviceCopy,
-            E: DeviceCopy,
-            F: DeviceCopy,
-            G: DeviceCopy,
-        > DeviceCopy for (A, B, C, D, E, F, G)
+        A: DeviceCopy,
+        B: DeviceCopy,
+        C: DeviceCopy,
+        D: DeviceCopy,
+        E: DeviceCopy,
+        F: DeviceCopy,
+        G: DeviceCopy,
+    > DeviceCopy for (A, B, C, D, E, F, G)
     {
     }
     unsafe impl<
-            A: DeviceCopy,
-            B: DeviceCopy,
-            C: DeviceCopy,
-            D: DeviceCopy,
-            E: DeviceCopy,
-            F: DeviceCopy,
-            G: DeviceCopy,
-            H: DeviceCopy,
-        > DeviceCopy for (A, B, C, D, E, F, G, H)
+        A: DeviceCopy,
+        B: DeviceCopy,
+        C: DeviceCopy,
+        D: DeviceCopy,
+        E: DeviceCopy,
+        F: DeviceCopy,
+        G: DeviceCopy,
+        H: DeviceCopy,
+    > DeviceCopy for (A, B, C, D, E, F, G, H)
     {
     }
 
diff --git a/crates/cust_derive/Cargo.toml b/crates/cust_derive/Cargo.toml
@@ -2,7 +2,7 @@
 name = "cust_derive"
 version = "0.2.0"
 authors = ["Brook Heisler <brookheisler@gmail.com>", "Riccardo D'Ambrosio <rdambrosio016@gmail.com>"]
-edition = "2021"
+edition = "2024"
 license = "MIT OR Apache-2.0"
 description = "Macros for cust"
 repository = "https://github.com/Rust-GPU/rust-cuda"
diff --git a/crates/cust_derive/src/lib.rs b/crates/cust_derive/src/lib.rs
@@ -6,21 +6,21 @@ extern crate syn;
 
 use proc_macro2::{Ident, Span, TokenStream};
 use syn::{
-    parse_str, Data, DataEnum, DataStruct, DataUnion, DeriveInput, Field, Fields, Generics,
-    TypeParamBound,
+    Data, DataEnum, DataStruct, DataUnion, DeriveInput, Field, Fields, Generics, TypeParamBound,
+    parse_str,
 };
 
 #[proc_macro_derive(DeviceCopyCore)]
 pub fn device_copy_core(input: BaseTokenStream) -> BaseTokenStream {
     let ast = syn::parse(input).unwrap();
-    let gen = impl_device_copy(&ast, quote!(::cust_core::DeviceCopy));
-    BaseTokenStream::from(gen)
+    let code = impl_device_copy(&ast, quote!(::cust_core::DeviceCopy));
+    BaseTokenStream::from(code)
 }
 #[proc_macro_derive(DeviceCopy)]
 pub fn device_copy(input: BaseTokenStream) -> BaseTokenStream {
     let ast = syn::parse(input).unwrap();
-    let gen = impl_device_copy(&ast, quote!(::cust::memory::DeviceCopy));
-    BaseTokenStream::from(gen)
+    let code = impl_device_copy(&ast, quote!(::cust::memory::DeviceCopy));
+    BaseTokenStream::from(code)
 }
 
 use proc_macro::TokenStream as BaseTokenStream;
diff --git a/crates/gpu_rand/Cargo.toml b/crates/gpu_rand/Cargo.toml
@@ -3,7 +3,7 @@ name = "gpu_rand"
 version = "0.1.3"
 authors = ["The Rand Project Developers", "The Rust CUDA Project Developers"]
 license = "MIT OR Apache-2.0"
-edition = "2021"
+edition = "2024"
 description = "GPU-friendly random number generators for the Rust CUDA Project"
 repository = "https://github.com/Rust-GPU/rust-cuda"
 readme = "../../README.md"
diff --git a/crates/gpu_rand/src/lib.rs b/crates/gpu_rand/src/lib.rs
@@ -5,7 +5,7 @@
 //! assembly. However, it is supposed to also work on the CPU, allowing you to reuse the same random states across CPU and GPU.
 //!
 //! A lot of the initial code is taken from the [rust-random project](https://github.com/rust-random) and modified to make it able to
-//! pass to the GPU, as well as cleaning up certain things and updating it to edition 2021.
+//! pass to the GPU, as well as cleaning up certain things and updating it to edition 2024.
 //! The following generators are implemented:
 //!
 
diff --git a/crates/gpu_rand/src/xoroshiro/mod.rs b/crates/gpu_rand/src/xoroshiro/mod.rs
@@ -75,11 +75,11 @@ mod xoshiro512starstar;
 pub use common::Seed512;
 pub use rand_core;
 pub use splitmix64::SplitMix64;
+pub use xoroshiro64star::Xoroshiro64Star;
+pub use xoroshiro64starstar::Xoroshiro64StarStar;
 pub use xoroshiro128plus::Xoroshiro128Plus;
 pub use xoroshiro128plusplus::Xoroshiro128PlusPlus;
 pub use xoroshiro128starstar::Xoroshiro128StarStar;
-pub use xoroshiro64star::Xoroshiro64Star;
-pub use xoroshiro64starstar::Xoroshiro64StarStar;
 pub use xoshiro128plus::Xoshiro128Plus;
 pub use xoshiro128plusplus::Xoshiro128PlusPlus;
 pub use xoshiro128starstar::Xoshiro128StarStar;
diff --git a/crates/nvvm/Cargo.toml b/crates/nvvm/Cargo.toml
@@ -2,7 +2,7 @@
 name = "nvvm"
 version = "0.1.1"
 authors = ["Riccardo D'Ambrosio <rdambrosio016@gmail.com>"]
-edition = "2021"
+edition = "2024"
 license = "MIT OR Apache-2.0"
 description = "High level bindings to libnvvm"
 repository = "https://github.com/Rust-GPU/rust-cuda"
diff --git a/crates/nvvm/src/lib.rs b/crates/nvvm/src/lib.rs
@@ -746,8 +746,8 @@ impl NvvmProgram {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use std::str::FromStr;
     use NvvmArch::*;
+    use std::str::FromStr;
 
     #[test]
     fn nvvm_arch_capability_value() {
@@ -836,7 +836,9 @@ mod tests {
 
         assert_eq!(
             Compute70.all_target_features(),
-            vec![Compute50, Compute52, Compute53, Compute60, Compute61, Compute62, Compute70]
+            vec![
+                Compute50, Compute52, Compute53, Compute60, Compute61, Compute62, Compute70
+            ]
         );
 
         assert_eq!(
diff --git a/crates/optix/examples/path_tracer/Cargo.toml b/crates/optix/examples/path_tracer/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "path-tracer"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 glam = { version = "0.30", features = ["bytemuck", "cuda", "mint"] }
diff --git a/crates/optix/examples/path_tracer/kernels/Cargo.toml b/crates/optix/examples/path_tracer/kernels/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "path-tracer-kernels"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 cuda_std = { version = "0.2", path = "../../../../cuda_std" }
diff --git a/crates/ptx/Cargo.toml b/crates/ptx/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "ptx"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 license = "MIT OR Apache-2.0"
 description = "PTX parser and analyzer"
 repository = "https://github.com/Rust-GPU/rust-cuda"
diff --git a/crates/ptx/src/lexer.rs b/crates/ptx/src/lexer.rs
@@ -107,10 +107,10 @@ impl<'src> Lexer<'src> {
         Some(Ok(match cur {
             AsciiChar::Percent => {
                 let peek = self.peek();
-                if let Some(peeked) = peek {
-                    if is_ident_continue(peeked) {
-                        return Some(Ok(self.opcode_or_ident()));
-                    }
+                if let Some(peeked) = peek
+                    && is_ident_continue(peeked)
+                {
+                    return Some(Ok(self.opcode_or_ident()));
                 }
                 self.eat_and_ret_token(1, TokenKind::Modulo)
             }
@@ -440,14 +440,14 @@ impl<'src> Lexer<'src> {
         let cur = self.cur;
         let ident = self.eat_until(|c, _| is_ident_continue(c));
         // check if its an instruction
-        if ident.chars().all(|c| c.is_ascii_alphanumeric()) {
-            if let Ok(kind) = InstructionKind::from_str(ident.as_str()) {
-                *self.values.last_mut().unwrap() = Some(TokenValue::Instruction(kind));
-                return Token {
-                    kind: TokenKind::Instruction,
-                    range: cur..self.cur,
-                };
-            }
+        if ident.chars().all(|c| c.is_ascii_alphanumeric())
+            && let Ok(kind) = InstructionKind::from_str(ident.as_str())
+        {
+            *self.values.last_mut().unwrap() = Some(TokenValue::Instruction(kind));
+            return Token {
+                kind: TokenKind::Instruction,
+                range: cur..self.cur,
+            };
         }
 
         *self.values.last_mut().unwrap() =
@@ -468,7 +468,7 @@ impl<'src> Lexer<'src> {
                 return Ok(Token {
                     kind: TokenKind::Dot,
                     range: cur..self.cur,
-                })
+                });
             }
             Some(c) if !is_ident_continue(c) => {
                 return Ok(Token {
diff --git a/crates/ptx_compiler/Cargo.toml b/crates/ptx_compiler/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "ptx_compiler"
 version = "0.1.1"
-edition = "2021"
+edition = "2024"
 license = "MIT OR Apache-2.0"
 description = "High level bindings to CUDA's ptx compilation APIs"
 repository = "https://github.com/Rust-GPU/rust-cuda"
diff --git a/crates/rustc_codegen_nvvm_macros/Cargo.toml b/crates/rustc_codegen_nvvm_macros/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "rustc_codegen_nvvm_macros"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 license = "MIT OR Apache-2.0"
 description = "Macros for rustc_codegen_nvvm"
 repository = "https://github.com/Rust-GPU/rust-cuda"
diff --git a/tests/compiletests/Cargo.toml b/tests/compiletests/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "compiletests"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [[bin]]
 name = "compiletests"
diff --git a/tests/compiletests/src/main.rs b/tests/compiletests/src/main.rs
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
