Re: [PATCH v2 18/22] rust: pin-init: internal: synchronize with user-space version

[Fiona Behrens]

Benno Lossin <benno.lossin@xxxxxxxxx> writes:

> 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: Benno Lossin <benno.lossin@xxxxxxxxx>
> Reviewed-by: Andreas Hindborg <a.hindborg@xxxxxxxxxx>
> Tested-by: Andreas Hindborg <a.hindborg@xxxxxxxxxx>

Reviewed-by: Fiona Behrens <me@xxxxxxxxxx>

> ---
>  rust/pin-init/internal/src/helpers.rs     |  3 +++
>  rust/pin-init/internal/src/lib.rs         | 16 +++++++++++++---
>  rust/pin-init/internal/src/pin_data.rs    |  3 +++
>  rust/pin-init/internal/src/pinned_drop.rs |  3 +++
>  rust/pin-init/internal/src/zeroable.rs    |  3 +++
>  5 files changed, 25 insertions(+), 3 deletions(-)
>
> diff --git a/rust/pin-init/internal/src/helpers.rs b/rust/pin-init/internal/src/helpers.rs
> index 78521ba19d0b..236f989a50f2 100644
> --- a/rust/pin-init/internal/src/helpers.rs
> +++ b/rust/pin-init/internal/src/helpers.rs
> @@ -1,5 +1,8 @@
>  // SPDX-License-Identifier: Apache-2.0 OR MIT
>  
> +#[cfg(not(kernel))]
> +use proc_macro2 as proc_macro;
> +
>  use proc_macro::{TokenStream, TokenTree};
>  
>  /// Parsed generics.
> diff --git a/rust/pin-init/internal/src/lib.rs b/rust/pin-init/internal/src/lib.rs
> index c201b8a53915..30e145f80bc0 100644
> --- a/rust/pin-init/internal/src/lib.rs
> +++ b/rust/pin-init/internal/src/lib.rs
> @@ -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()
>  }
> diff --git a/rust/pin-init/internal/src/pin_data.rs b/rust/pin-init/internal/src/pin_data.rs
> index 9b974498f4a8..87d4a7eb1d35 100644
> --- a/rust/pin-init/internal/src/pin_data.rs
> +++ b/rust/pin-init/internal/src/pin_data.rs
> @@ -1,5 +1,8 @@
>  // 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};
>  
> diff --git a/rust/pin-init/internal/src/pinned_drop.rs b/rust/pin-init/internal/src/pinned_drop.rs
> index 386f52f73c06..c824dd8b436d 100644
> --- a/rust/pin-init/internal/src/pinned_drop.rs
> +++ b/rust/pin-init/internal/src/pinned_drop.rs
> @@ -1,5 +1,8 @@
>  // 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 {
> diff --git a/rust/pin-init/internal/src/zeroable.rs b/rust/pin-init/internal/src/zeroable.rs
> index 0cf6732f27dc..acc94008c152 100644
> --- a/rust/pin-init/internal/src/zeroable.rs
> +++ b/rust/pin-init/internal/src/zeroable.rs
> @@ -1,5 +1,8 @@
>  // 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};