github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

rust: pin-init: internal: make __init_data and __pin_data safe

Browse Source 
Remove the unsafe markers of `__init_data` and `__pin_data`. These methods
are for inference help and does not need to be unsafe.

The `HasInitData` cannot be implemented outside pin-init, so the `unsafe
trait` marker is not necessary.

Link: https://patch.msgid.link/20260923-dev-pin-data-diag-v1-1-e4d7193569e5@garyguo.net
Signed-off-by: Gary Guo <gary@garyguo.net>
This commit is contained in:
Gary Guo 2026-09-23 19:20:14 +01:00
parent f201d785ca
commit ad5545276a
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rust/pin-init/internal/src/init.rs
View File

@ -312,8 +312,7 @@ fn assert_zeroable<T: ?::core::marker::Sized>(_: *mut T)
let field_check = make_field_check(&fields, init_kind, &path);
Ok(quote_spanned! { Span::mixed_site() => {
// Get the data about fields from the supplied type.
// SAFETY: TODO
let data = unsafe {
let data = {
use ::pin_init::__internal::#has_data_trait;
// Can't use `<#path as #has_data_trait>::#get_data`, since the user is able to omit
// generics (which need to be present with that syntax).

2
rust/pin-init/internal/src/pin_data.rs
View File

@ -527,7 +527,7 @@ unsafe impl #impl_generics ::pin_init::__internal::HasPinData for #struct_name #
type PinData = __ThePinData #ty_generics;
#[inline]
unsafe fn __pin_data() -> Self::PinData {
fn __pin_data() -> Self::PinData {
__ThePinData { __phantom: ::pin_init::__internal::PhantomInvariant::new() }
}
}

11
rust/pin-init/src/__internal.rs
View File

@ -65,12 +65,12 @@ pub unsafe fn new() -> Self {
///
/// # Safety
///
/// Only the `init` module is allowed to use this trait.
/// `pin-init` relies on the correctness of the helper functions defined on `PinData`.
/// Thus, only the `#[pin_data]` can implement this trait.
pub unsafe trait HasPinData {
type PinData;
#[expect(clippy::missing_safety_doc)]
unsafe fn __pin_data() -> Self::PinData;
fn __pin_data() -> Self::PinData;
}
/// This trait is automatically implemented for every type. It aims to provide the same type
@ -82,8 +82,7 @@ pub unsafe trait HasPinData {
pub unsafe trait HasInitData {
type InitData;
#[expect(clippy::missing_safety_doc)]
unsafe fn __init_data() -> Self::InitData;
fn __init_data() -> Self::InitData;
}
pub struct AllData<T: ?Sized>(PhantomInvariant<T>);
@ -113,7 +112,7 @@ unsafe impl<T: ?Sized> HasInitData for T {
type InitData = AllData<T>;
#[inline]
unsafe fn __init_data() -> Self::InitData {
fn __init_data() -> Self::InitData {
AllData(PhantomInvariant::new())
}
}