Update Rust toolchain to nightly-2025-06-23

Author: LegNeato

crates/cuda_builder/src/lib.rs

@@ -25,7 +25,7 @@ impl fmt::Display for CudaBuilderError {
             }
             CudaBuilderError::BuildFailed => f.write_str("Build failed"),
             CudaBuilderError::FailedToCopyPtxFile(err) => {
-                f.write_str(&format!("Failed to copy PTX file: {:?}", err))
+                f.write_str(&format!("Failed to copy PTX file: {err:?}"))
             }
         }
     }
@@ -369,19 +369,14 @@ fn find_rustc_codegen_nvvm() -> PathBuf {
             return path;
         }
     }
-    panic!("Could not find {} in library path", filename);
+    panic!("Could not find {filename} in library path");
 }
 
 /// Joins strings together while ensuring none of the strings contain the separator.
 fn join_checking_for_separators(strings: Vec<impl Borrow<str>>, sep: &str) -> String {
     for s in &strings {
         let s = s.borrow();
-        assert!(
-            !s.contains(sep),
-            "{:?} may not contain separator {:?}",
-            s,
-            sep
-        );
+        assert!(!s.contains(sep), "{s:?} may not contain separator {sep:?}");
     }
     strings.join(sep)
 }
@@ -404,7 +399,7 @@ fn invoke_rustc(builder: &CudaBuilder) -> Result<PathBuf, CudaBuilderError> {
             EmitOption::LlvmIr => "llvm-ir",
             EmitOption::Bitcode => "llvm-bc",
         };
-        rustflags.push(format!("--emit={}", string));
+        rustflags.push(format!("--emit={string}"));
     }
 
     let mut llvm_args = vec![NvvmOption::Arch(builder.arch).to_string()];
@@ -533,7 +528,7 @@ fn get_last_artifact(out: &str) -> Option<PathBuf> {
             Ok(line) => Some(line),
             Err(_) => {
                 // Pass through invalid lines
-                println!("{}", line);
+                println!("{line}");
                 None
             }
         })

crates/cuda_std/src/thread.rs

@@ -66,7 +66,7 @@ macro_rules! inbounds {
     }};
     ($func_name:ident, $lower_bound:expr, $upper_bound:expr) => {{
         let val = unsafe { $func_name() };
-        if val < $lower_bound || val > $upper_bound {
+        if !($lower_bound..=$upper_bound).contains(&val) {
             // SAFETY: this condition is declared unreachable by compute capability max bound
             // https://docs.nvidia.com/cuda/cuda-c-programming-guide/index.html#compute-capabilities
             // we do this to potentially allow for better optimizations by LLVM

crates/cust/src/error.rs

@@ -105,7 +105,7 @@ impl fmt::Display for CudaError {
                     .to_result()
                     .map_err(|_| fmt::Error)?;
                     let cstr = CStr::from_ptr(ptr);
-                    write!(f, "{:?}", cstr)
+                    write!(f, "{cstr:?}")
                 }
             }
             // This shouldn't happen

crates/cust/src/function.rs

@@ -213,7 +213,7 @@ unsafe impl Send for Function<'_> {}
 unsafe impl Sync for Function<'_> {}
 
 impl Function<'_> {
-    pub(crate) fn new(inner: CUfunction, _module: &Module) -> Function {
+    pub(crate) fn new(inner: CUfunction, _module: &Module) -> Function<'_> {
         Function {
             inner,
             module: PhantomData,

crates/cust/src/memory/array.rs

@@ -139,7 +139,7 @@ impl ArrayFormat {
             // there are literally no docs on what nv12 is???
             // it seems to be something with multiplanar arrays, needs some investigation
             CUarray_format_enum::CU_AD_FORMAT_NV12 => panic!("nv12 is not supported yet"),
-            _ => panic!("Unsupported array format: {:?}", raw),
+            _ => panic!("Unsupported array format: {raw:?}"),
         }
     }
 

crates/cust/src/memory/device/device_buffer.rs

@@ -288,7 +288,7 @@ impl<T: DeviceCopy + Zeroable> DeviceBuffer<T> {
 
 #[cfg(feature = "bytemuck")]
 fn casting_went_wrong(src: &str, err: PodCastError) -> ! {
-    panic!("{}>{:?}", src, err);
+    panic!("{src}>{err:?}");
 }
 
 #[cfg(feature = "bytemuck")]

crates/cust/src/memory/device/device_slice.rs

@@ -445,27 +445,21 @@ pub trait DeviceSliceIndex<T: DeviceCopy> {
 #[cold]
 #[track_caller]
 fn slice_start_index_len_fail(index: usize, len: usize) -> ! {
-    panic!(
-        "range start index {} out of range for slice of length {}",
-        index, len
-    );
+    panic!("range start index {index} out of range for slice of length {len}");
 }
 
 #[inline(never)]
 #[cold]
 #[track_caller]
 fn slice_end_index_len_fail(index: usize, len: usize) -> ! {
-    panic!(
-        "range end index {} out of range for slice of length {}",
-        index, len
-    );
+    panic!("range end index {index} out of range for slice of length {len}");
 }
 
 #[inline(never)]
 #[cold]
 #[track_caller]
 fn slice_index_order_fail(index: usize, end: usize) -> ! {
-    panic!("slice index starts at {} but ends at {}", index, end);
+    panic!("slice index starts at {index} but ends at {end}");
 }
 
 #[inline(never)]

crates/cust_raw/build/callbacks.rs

@@ -42,10 +42,7 @@ impl ParseCallbacks for BindgenCallbacks {
         match doxygen_bindgen::transform(&cleaned) {
             Ok(res) => Some(res),
             Err(err) => {
-                println!(
-                    "cargo:warning=Problem processing doxygen comment: {}\n{}",
-                    comment, err
-                );
+                println!("cargo:warning=Problem processing doxygen comment: {comment}\n{err}");
                 None
             }
         }
@@ -184,7 +181,7 @@ impl FunctionRenames {
 
             let expanded = match build.try_expand() {
                 Ok(expanded) => expanded,
-                Err(e) => panic!("Failed to expand macros: {}", e),
+                Err(e) => panic!("Failed to expand macros: {e}"),
             };
             let expanded = str::from_utf8(&expanded).unwrap();
 

crates/cust_raw/build/cuda_sdk.rs

@@ -164,7 +164,7 @@ impl CudaSdk {
         cuda_root: &path::Path,
     ) -> Result<Vec<path::PathBuf>, Box<dyn error::Error>> {
         let (target, triple) = Self::parse_target_triple()?;
-        assert!(triple.len() >= 3, "Invalid target triple: {:?}", triple);
+        assert!(triple.len() >= 3, "Invalid target triple: {triple:?}");
 
         let search_dirs = match [triple[0].as_str(), triple[1].as_str(), triple[2].as_str()] {
             ["x86_64", "pc", "windows"] => {
@@ -248,7 +248,7 @@ impl CudaSdk {
             .ok_or("Cannot find CUDA_VERSION from CUDA header file.")?;
         let version = version
             .parse::<u32>()
-            .map_err(|_| format!("Cannot parse CUDA_VERSION as u32: '{}'", version))?;
+            .map_err(|_| format!("Cannot parse CUDA_VERSION as u32: '{version}'"))?;
         Ok(version)
     }
 
@@ -264,7 +264,7 @@ impl CudaSdk {
             .ok_or("Cannot find CUDART_VERSION from cuda_runtime header file.")?;
         let version = version
             .parse::<u32>()
-            .map_err(|_| format!("Cannot parse CUDART_VERSION as u32: '{}'", version))?;
+            .map_err(|_| format!("Cannot parse CUDART_VERSION as u32: '{version}'"))?;
         Ok(version)
     }
 

crates/cust_raw/build/main.rs

@@ -59,12 +59,12 @@ fn main() {
     let metadata_nvvm_include = env::join_paths(sdk.nvvm_include_paths())
         .map(|s| s.to_string_lossy().to_string())
         .expect("Failed to build metadata for nvvm_include.");
-    println!("cargo::metadata=includes={}", metadata_cuda_include);
-    println!("cargo::metadata=nvvm_includes={}", metadata_nvvm_include);
+    println!("cargo::metadata=includes={metadata_cuda_include}");
+    println!("cargo::metadata=nvvm_includes={metadata_nvvm_include}");
     // Re-run build script conditions.
     println!("cargo::rerun-if-changed=build");
     for e in sdk.related_cuda_envs() {
-        println!("cargo::rerun-if-env-changed={}", e);
+        println!("cargo::rerun-if-env-changed={e}");
     }
 
     create_cuda_driver_bindings(&sdk, &outdir, &manifest_dir);
@@ -138,6 +138,12 @@ fn create_cuda_driver_bindings(
         .allowlist_type("^cuda.*")
         .allowlist_var("^CU.*")
         .allowlist_function("^cu.*")
+        .no_partialeq("CUDA_HOST_NODE_PARAMS.*")
+        .no_partialeq("CUDA_KERNEL_NODE_PARAMS.*")
+        .no_hash("CUDA_HOST_NODE_PARAMS.*")
+        .no_hash("CUDA_KERNEL_NODE_PARAMS.*")
+        .no_copy("CUDA_HOST_NODE_PARAMS.*")
+        .no_copy("CUDA_KERNEL_NODE_PARAMS.*")
         .default_enum_style(bindgen::EnumVariation::Rust {
             non_exhaustive: false,
         })