Update MSRV to 1.78-nightly

juntyr · juntyr · commit 44cd71b9aa74 · 2024-05-18T08:38:33.000Z
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,7 +13,7 @@ version = "0.1.0"
 authors = ["Juniper Tyree <juniper.tyree@helsinki.fi>"]
 license = "MIT OR Apache-2.0"
 edition = "2021"
-rust-version = "1.75" # nightly
+rust-version = "1.78" # nightly
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -29,7 +29,7 @@ rustacuda_core = "0.1.2"
 rustacuda = { version = "0.1.3", optional = true }
 rustacuda_derive = { version = "0.1.2", optional = true }
 
-const-type-layout = { version = "0.2.0", features = ["derive"] }
+const-type-layout = { version = "0.3.0", features = ["derive"] }
 
 final = "0.1.1"
 hashbrown = { version = "0.14", default-features = false, features = ["inline-more"], optional = true }
diff --git a/examples/derive/Cargo.toml b/examples/derive/Cargo.toml
@@ -8,5 +8,5 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-const-type-layout = { version = "0.2.0" }
+const-type-layout = { version = "0.3.0" }
 rust-cuda = { path = "../../", features = ["derive", "host"] }
diff --git a/examples/derive/src/lib.rs b/examples/derive/src/lib.rs
@@ -1,6 +1,5 @@
 #![deny(clippy::pedantic)]
 #![feature(const_type_name)]
-#![feature(offset_of)]
 
 #[derive(rust_cuda::common::LendRustToCuda)]
 struct Inner<T: Copy> {
diff --git a/examples/single-source/Cargo.toml b/examples/single-source/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-const-type-layout = { version = "0.2.0" }
+const-type-layout = { version = "0.3.0" }
 
 [target.'cfg(target_os = "cuda")'.dependencies]
 rust-cuda = { path = "../../", features = ["derive"] }
diff --git a/examples/single-source/src/main.rs b/examples/single-source/src/main.rs
@@ -3,10 +3,9 @@
 #![cfg_attr(target_os = "cuda", no_main)]
 #![cfg_attr(target_os = "cuda", feature(abi_ptx))]
 #![cfg_attr(target_os = "cuda", feature(alloc_error_handler))]
-#![cfg_attr(target_os = "cuda", feature(stdsimd))]
+#![cfg_attr(target_os = "cuda", feature(stdarch_nvptx))]
 #![cfg_attr(target_os = "cuda", feature(asm_experimental_arch))]
 #![feature(const_type_name)]
-#![feature(offset_of)]
 
 extern crate alloc;
 
diff --git a/rust-cuda-derive/src/kernel/link/config.rs b/rust-cuda-derive/src/kernel/link/config.rs
@@ -1,5 +1,7 @@
 use std::path::PathBuf;
 
+use quote::quote;
+
 #[allow(clippy::module_name_repetitions)]
 pub(super) struct LinkKernelConfig {
     pub(super) kernel: syn::Ident,
diff --git a/rust-cuda-derive/src/kernel/link/mod.rs b/rust-cuda-derive/src/kernel/link/mod.rs
@@ -11,6 +11,7 @@ use ptx_builder::{
     builder::{BuildStatus, Builder, MessageFormat, Profile},
     error::{BuildErrorKind, Error, Result},
 };
+use quote::quote;
 
 use super::utils::skip_kernel_compilation;
 
@@ -287,7 +288,7 @@ fn build_kernel_with_specialisation(
         let any_output = AtomicBool::new(false);
         let crate_name = String::from(builder.get_crate_name());
 
-        match builder.build_live(
+        let status = builder.build_live(
             |stdout_line| {
                 if let Ok(cargo_metadata::Message::CompilerMessage(mut message)) =
                     serde_json::from_str(stdout_line)
@@ -355,7 +356,9 @@ fn build_kernel_with_specialisation(
                 );
                 colored::control::unset_override();
             },
-        )? {
+        )?;
+
+        match status {
             BuildStatus::Success(output) => {
                 let ptx_path = output.get_assembly_path();
 
diff --git a/rust-cuda-derive/src/kernel/specialise/call.rs b/rust-cuda-derive/src/kernel/specialise/call.rs
@@ -1,4 +1,5 @@
 use proc_macro::TokenStream;
+use quote::quote;
 
 #[allow(clippy::module_name_repetitions)]
 pub fn specialise_kernel_call(tokens: TokenStream) -> TokenStream {
diff --git a/rust-cuda-derive/src/kernel/specialise/entry.rs b/rust-cuda-derive/src/kernel/specialise/entry.rs
@@ -1,6 +1,7 @@
 use std::env::VarError;
 
 use proc_macro::TokenStream;
+use quote::quote;
 
 #[allow(clippy::module_name_repetitions)]
 pub fn specialise_kernel_entry(attr: TokenStream, func: TokenStream) -> TokenStream {
diff --git a/rust-cuda-derive/src/kernel/wrapper/generate/args_trait.rs b/rust-cuda-derive/src/kernel/wrapper/generate/args_trait.rs
@@ -1,4 +1,5 @@
 use proc_macro2::TokenStream;
+use quote::quote;
 
 use super::super::{DeclGenerics, FunctionInputs, ImplGenerics, KernelConfig};
 
diff --git a/rust-cuda-derive/src/kernel/wrapper/generate/cpu_linker_macro/get_ptx_str.rs b/rust-cuda-derive/src/kernel/wrapper/generate/cpu_linker_macro/get_ptx_str.rs
@@ -1,4 +1,5 @@
 use proc_macro2::TokenStream;
+use quote::quote;
 use syn::spanned::Spanned;
 
 use crate::kernel::utils::skip_kernel_compilation;
diff --git a/rust-cuda-derive/src/kernel/wrapper/generate/cpu_linker_macro/kernel_func.rs b/rust-cuda-derive/src/kernel/wrapper/generate/cpu_linker_macro/kernel_func.rs
@@ -1,4 +1,5 @@
 use proc_macro2::TokenStream;
+use quote::quote;
 
 use super::super::super::{DeclGenerics, FuncIdent, FunctionInputs, InputCudaType, KernelConfig};
 
diff --git a/rust-cuda-derive/src/kernel/wrapper/generate/cpu_linker_macro/kernel_func_raw/launch_types.rs b/rust-cuda-derive/src/kernel/wrapper/generate/cpu_linker_macro/kernel_func_raw/launch_types.rs
@@ -1,4 +1,5 @@
 use proc_macro2::TokenStream;
+use quote::quote;
 use syn::spanned::Spanned;
 
 use crate::kernel::utils::r2c_move_lifetime;
diff --git a/rust-cuda-derive/src/kernel/wrapper/generate/cpu_linker_macro/kernel_func_raw/mod.rs b/rust-cuda-derive/src/kernel/wrapper/generate/cpu_linker_macro/kernel_func_raw/mod.rs
@@ -1,4 +1,5 @@
 use proc_macro2::TokenStream;
+use quote::quote;
 
 use super::super::super::{DeclGenerics, FuncIdent, FunctionInputs, KernelConfig};
 
diff --git a/rust-cuda-derive/src/kernel/wrapper/generate/cpu_linker_macro/kernel_func_raw/raw_func_types.rs b/rust-cuda-derive/src/kernel/wrapper/generate/cpu_linker_macro/kernel_func_raw/raw_func_types.rs
@@ -1,4 +1,5 @@
 use proc_macro2::TokenStream;
+use quote::quote;
 use syn::spanned::Spanned;
 
 use crate::kernel::utils::r2c_move_lifetime;
diff --git a/rust-cuda-derive/src/kernel/wrapper/generate/cpu_linker_macro/kernel_func_raw/type_wrap.rs b/rust-cuda-derive/src/kernel/wrapper/generate/cpu_linker_macro/kernel_func_raw/type_wrap.rs
@@ -1,4 +1,5 @@
 use proc_macro2::TokenStream;
+use quote::quote;
 
 use crate::kernel::wrapper::InputCudaType;
 
diff --git a/rust-cuda-derive/src/kernel/wrapper/generate/cpu_linker_macro/mod.rs b/rust-cuda-derive/src/kernel/wrapper/generate/cpu_linker_macro/mod.rs
@@ -1,4 +1,5 @@
 use proc_macro2::TokenStream;
+use quote::quote;
 
 use super::super::{DeclGenerics, FuncIdent, FunctionInputs, KernelConfig};
 
diff --git a/rust-cuda-derive/src/kernel/wrapper/generate/cpu_linker_macro/new_kernel.rs b/rust-cuda-derive/src/kernel/wrapper/generate/cpu_linker_macro/new_kernel.rs
@@ -1,4 +1,5 @@
 use proc_macro2::TokenStream;
+use quote::quote;
 
 use super::super::super::{DeclGenerics, FuncIdent, KernelConfig};
 
diff --git a/rust-cuda-derive/src/kernel/wrapper/generate/cpu_wrapper.rs b/rust-cuda-derive/src/kernel/wrapper/generate/cpu_wrapper.rs
@@ -1,4 +1,5 @@
 use proc_macro2::TokenStream;
+use quote::quote;
 
 use crate::kernel::utils::r2c_move_lifetime;
 
diff --git a/rust-cuda-derive/src/kernel/wrapper/generate/cuda_generic_function.rs b/rust-cuda-derive/src/kernel/wrapper/generate/cuda_generic_function.rs
@@ -1,4 +1,5 @@
 use proc_macro2::TokenStream;
+use quote::quote;
 
 use super::super::{DeclGenerics, FuncIdent};
 
diff --git a/rust-cuda-derive/src/kernel/wrapper/generate/cuda_wrapper.rs b/rust-cuda-derive/src/kernel/wrapper/generate/cuda_wrapper.rs
@@ -1,5 +1,5 @@
 use proc_macro2::TokenStream;
-use quote::quote_spanned;
+use quote::{quote, quote_spanned};
 use syn::spanned::Spanned;
 
 use super::super::{FuncIdent, FunctionInputs, InputCudaType, KernelConfig};
diff --git a/rust-cuda-derive/src/kernel/wrapper/mod.rs b/rust-cuda-derive/src/kernel/wrapper/mod.rs
@@ -16,6 +16,7 @@ use generate::{
 use inputs::{parse_function_inputs, FunctionInputs};
 use parse::parse_kernel_fn;
 use proc_macro2::Span;
+use quote::quote;
 use syn::spanned::Spanned;
 
 #[allow(clippy::too_many_lines)]
diff --git a/rust-cuda-ptx-jit/src/host/kernel.rs b/rust-cuda-ptx-jit/src/host/kernel.rs
@@ -17,7 +17,7 @@ impl CudaKernel {
     pub fn new(ptx: &CStr, entry_point: &CStr) -> CudaResult<Self> {
         let module = Box::new(Module::load_from_string(ptx)?);
 
-        let function = unsafe { &*(module.as_ref() as *const Module) }.get_function(entry_point);
+        let function = unsafe { &*std::ptr::from_ref(module.as_ref()) }.get_function(entry_point);
 
         let function = match function {
             Ok(function) => function,
diff --git a/rust-toolchain b/rust-toolchain
@@ -1,5 +1,5 @@
 [toolchain]
-# Pin version pin until const traits are back
-channel = "nightly-2023-11-10"
+# Pin to final 1.78.0 nightly
+channel = "nightly-2024-03-17"
 components = [ "cargo", "rustfmt", "clippy" ]
 targets = [ "x86_64-unknown-linux-gnu", "nvptx64-nvidia-cuda" ]
diff --git a/src/common.rs b/src/common.rs
@@ -1,5 +1,3 @@
-#[cfg(any(not(feature = "host"), doc))]
-use core::convert::{AsMut, AsRef};
 use core::marker::PhantomData;
 
 #[cfg(feature = "host")]
diff --git a/src/lib.rs b/src/lib.rs
@@ -6,13 +6,12 @@
 #![feature(negative_impls)]
 #![cfg_attr(
     any(all(not(feature = "host"), target_os = "cuda"), doc),
-    feature(stdsimd)
+    feature(stdarch_nvptx)
 )]
 #![cfg_attr(any(feature = "alloc", doc), feature(allocator_api))]
 #![feature(doc_cfg)]
 #![feature(marker_trait_attr)]
 #![feature(const_type_name)]
-#![feature(offset_of)]
 #![feature(adt_const_params)]
 #![allow(incomplete_features)]
 #![feature(generic_const_exprs)]
diff --git a/src/utils/aliasing/const.rs b/src/utils/aliasing/const.rs
@@ -1,6 +1,5 @@
 use core::{
     borrow::{Borrow, BorrowMut},
-    convert::{AsMut, AsRef},
     ops::{Deref, DerefMut},
 };
 
diff --git a/src/utils/aliasing/dynamic.rs b/src/utils/aliasing/dynamic.rs
@@ -1,6 +1,5 @@
 use core::{
     borrow::{Borrow, BorrowMut},
-    convert::{AsMut, AsRef},
     ops::{Deref, DerefMut},
 };
 
diff --git a/src/utils/aliasing/final.rs b/src/utils/aliasing/final.rs
@@ -42,7 +42,7 @@ unsafe impl<T: RustToCuda> RustToCuda for Final<T> {
         alloc: crate::host::CombinedCudaAlloc<Self::CudaAllocation, A>,
     ) -> rustacuda::error::CudaResult<A> {
         // Safety: Final is a repr(transparent) newtype wrapper around T
-        let inner: &mut T = &mut *(self as *mut Self).cast();
+        let inner: &mut T = &mut *core::ptr::from_mut(self).cast();
 
         inner.restore(alloc)
     }
diff --git a/src/utils/box.rs b/src/utils/box.rs
@@ -1,3 +1,4 @@
+#[allow(unused_imports)] // std prelude is not always imported
 use alloc::boxed::Box;
 
 use const_type_layout::TypeGraphLayout;
diff --git a/src/utils/boxed_slice.rs b/src/utils/boxed_slice.rs
@@ -1,3 +1,4 @@
+#[allow(unused_imports)] // std prelude is not always imported
 use alloc::boxed::Box;
 
 use const_type_layout::TypeGraphLayout;
diff --git a/src/utils/device_copy.rs b/src/utils/device_copy.rs
@@ -31,22 +31,22 @@ impl<T: SafeDeviceCopy + TypeGraphLayout> SafeDeviceCopyWrapper<T> {
 
     pub fn from_ref(reference: &T) -> &Self {
         // Safety: `SafeDeviceCopyWrapper` is a transparent newtype around `T`
-        unsafe { &*(reference as *const T).cast() }
+        unsafe { &*core::ptr::from_ref(reference).cast() }
     }
 
     pub fn into_ref(&self) -> &T {
         // Safety: `SafeDeviceCopyWrapper` is a transparent newtype around `T`
-        unsafe { &*(self as *const Self).cast() }
+        unsafe { &*core::ptr::from_ref(self).cast() }
     }
 
     pub fn from_mut(reference: &mut T) -> &mut Self {
         // Safety: `SafeDeviceCopyWrapper` is a transparent newtype around `T`
-        unsafe { &mut *(reference as *mut T).cast() }
+        unsafe { &mut *core::ptr::from_mut(reference).cast() }
     }
 
     pub fn into_mut(&mut self) -> &mut T {
         // Safety: `SafeDeviceCopyWrapper` is a transparent newtype around `T`
-        unsafe { &mut *(self as *mut Self).cast() }
+        unsafe { &mut *core::ptr::from_mut(self).cast() }
     }
 
     pub fn from_slice(slice: &[T]) -> &[Self] {
diff --git a/src/utils/exchange/buffer/host.rs b/src/utils/exchange/buffer/host.rs
@@ -1,3 +1,4 @@
+#[allow(unused_imports)] // std prelude is not always imported
 use alloc::vec::Vec;
 use core::{
     cell::UnsafeCell,
@@ -42,7 +43,7 @@ impl<T: Clone + SafeDeviceCopy + TypeGraphLayout, const M2D: bool, const M2H: bo
     /// Returns a `rustacuda::errors::CudaError` iff an error occurs inside CUDA
     pub fn new(elem: &T, capacity: usize) -> CudaResult<Self> {
         // Safety: CudaExchangeItem is a `repr(transparent)` wrapper around T
-        let elem: &CudaExchangeItem<T, M2D, M2H> = unsafe { &*(elem as *const T).cast() };
+        let elem: &CudaExchangeItem<T, M2D, M2H> = unsafe { &*core::ptr::from_ref(elem).cast() };
 
         let host_buffer = CudaDropWrapper::from(LockedBuffer::new(elem, capacity)?);
         let device_buffer = UnsafeCell::new(CudaDropWrapper::from(DeviceBuffer::from_slice(
diff --git a/src/utils/option.rs b/src/utils/option.rs
@@ -102,12 +102,12 @@ impl<T: SafeDeviceCopy + TypeGraphLayout> RustToCudaProxy<Option<T>>
 {
     fn from_ref(val: &Option<T>) -> &Self {
         // Safety: `SafeDeviceCopyWrapper` is a transparent newtype
-        unsafe { &*(val as *const Option<T>).cast() }
+        unsafe { &*core::ptr::from_ref(val).cast() }
     }
 
     fn from_mut(val: &mut Option<T>) -> &mut Self {
         // Safety: `SafeDeviceCopyWrapper` is a transparent newtype
-        unsafe { &mut *(val as *mut Option<T>).cast() }
+        unsafe { &mut *core::ptr::from_mut(val).cast() }
     }
 
     fn into(self) -> Option<T> {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`use proc_macro::TokenStream;`
	`2`	`+use quote::quote;`
`2`	`3`
`3`	`4`	`#[allow(clippy::module_name_repetitions)]`
`4`	`5`	`pub fn specialise_kernel_call(tokens: TokenStream) -> TokenStream {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`use proc_macro2::TokenStream;`
	`2`	`+use quote::quote;`
`2`	`3`
`3`	`4`	`use super::super::{DeclGenerics, FunctionInputs, ImplGenerics, KernelConfig};`
`4`	`5`