Commit 7cb5dee4 authored by Benno Lossin's avatar Benno Lossin Committed by Miguel Ojeda
Browse files

rust: pin-init: internal: synchronize with user-space version 

Synchronize the internal macros crate with the user-space version that
uses the quote crate [1] instead of a custom `quote!` macro. The imports
in the different version are achieved using `cfg` on the kernel config
value. This cfg is always set in the kernel and never set in the
user-space version.

Since the quote crate requires the proc_macro2 crate, imports also need
to be adjusted and `.into()` calls have to be inserted.

Link: https://crates.io/crates/quote

 [1]
Signed-off-by: default avatarBenno Lossin <benno.lossin@proton.me>
Reviewed-by: default avatarAndreas Hindborg <a.hindborg@kernel.org>
Tested-by: default avatarAndreas Hindborg <a.hindborg@kernel.org>
Reviewed-by: default avatarFiona Behrens <me@Kloenk.dev>
Link: https://lore.kernel.org/r/20250308110339.2997091-19-benno.lossin@proton.me


Signed-off-by: default avatarMiguel Ojeda <ojeda@kernel.org>
parent 02c01c08

rust/pin-init/internal/src/helpers.rs

+3 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: Apache-2.0 OR MIT



#[cfg(not(kernel))]

use proc_macro2 as proc_macro;



use proc_macro::{TokenStream, TokenTree};



/// Parsed generics.

rust/pin-init/internal/src/lib.rs

+13 −3
Original line number Diff line number Diff line
@@ -7,6 +7,13 @@ 
//! `pin-init` proc macros.



#![cfg_attr(not(RUSTC_LINT_REASONS_IS_STABLE), feature(lint_reasons))]

// Allow `.into()` to convert

// - `proc_macro2::TokenStream` into `proc_macro::TokenStream` in the user-space version.

// - `proc_macro::TokenStream` into `proc_macro::TokenStream` in the kernel version.

//   Clippy warns on this conversion, but it's required by the user-space version.

//

// Remove once we have `proc_macro2` in the kernel.

#![allow(clippy::useless_conversion)]



use proc_macro::TokenStream;
@@ -14,6 +21,9 @@ 
#[path = "../../../macros/quote.rs"]

#[macro_use]

mod quote;

#[cfg(not(kernel))]

#[macro_use]

extern crate quote;



mod helpers;

mod pin_data;
@@ -23,17 +33,17 @@ 
#[allow(missing_docs)]

#[proc_macro_attribute]

pub fn pin_data(inner: TokenStream, item: TokenStream) -> TokenStream {

    pin_data::pin_data(inner, item)

    pin_data::pin_data(inner.into(), item.into()).into()

}



#[allow(missing_docs)]

#[proc_macro_attribute]

pub fn pinned_drop(args: TokenStream, input: TokenStream) -> TokenStream {

    pinned_drop::pinned_drop(args, input)

    pinned_drop::pinned_drop(args.into(), input.into()).into()

}



#[allow(missing_docs)]

#[proc_macro_derive(Zeroable)]

pub fn derive_zeroable(input: TokenStream) -> TokenStream {

    zeroable::derive(input)

    zeroable::derive(input.into()).into()

}

rust/pin-init/internal/src/pin_data.rs

+3 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: Apache-2.0 OR MIT



#[cfg(not(kernel))]

use proc_macro2 as proc_macro;



use crate::helpers::{parse_generics, Generics};

use proc_macro::{Group, Punct, Spacing, TokenStream, TokenTree};

rust/pin-init/internal/src/pinned_drop.rs

+3 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: Apache-2.0 OR MIT



#[cfg(not(kernel))]

use proc_macro2 as proc_macro;



use proc_macro::{TokenStream, TokenTree};



pub(crate) fn pinned_drop(_args: TokenStream, input: TokenStream) -> TokenStream {

rust/pin-init/internal/src/zeroable.rs

+3 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0



#[cfg(not(kernel))]

use proc_macro2 as proc_macro;



use crate::helpers::{parse_generics, Generics};

use proc_macro::{TokenStream, TokenTree};