Fixed migration issues

Author: y86-dev

rust/kernel/init.rs

@@ -108,6 +108,7 @@ use core::{
 
 #[doc(hidden)]
 pub mod __private;
+mod pin_project;
 
 /// Initialize a type on the stack.
 ///
@@ -510,8 +511,7 @@ macro_rules! init {
     }}
 }
 
-// use the proc macro instead
-include!("init/pin_project.rs");
+//include!("init/pin_project.rs");
 
 /// An initializer for `T`.
 ///

rust/kernel/init/pin_project.rs

@@ -1,3 +1,5 @@
+// use the proc macro instead
+#[doc(hidden)]
 #[macro_export]
 macro_rules! pin_project {
     (parse_input:
@@ -9,7 +11,7 @@ macro_rules! pin_project {
         ),
         @body({ $($fields:tt)* })
     ) => {
-        $crate::init::pin_project!(find_pinned_fields:
+        $crate::pin_project!(find_pinned_fields:
             @struct_attrs($(#[$($struct_attr)*])*),
             @vis($vis),
             @name($name),
@@ -34,7 +36,7 @@ macro_rules! pin_project {
         ),
         @body({ $($fields:tt)* })
     ) => {
-        $crate::init::pin_project!(find_pinned_fields:
+        $crate::pin_project!(find_pinned_fields:
             @struct_attrs($(#[$($struct_attr)*])*),
             @vis($vis),
             @name($name),
@@ -65,7 +67,7 @@ macro_rules! pin_project {
         @is_pinned(yes),
         @pinned_drop($($pinned_drop:ident)?),
     ) => {
-        $crate::init::pin_project!(find_pinned_fields:
+        $crate::pin_project!(find_pinned_fields:
             @struct_attrs($($struct_attrs)*),
             @vis($vis),
             @name($name),
@@ -96,7 +98,7 @@ macro_rules! pin_project {
         @is_pinned(),
         @pinned_drop($($pinned_drop:ident)?),
     ) => {
-        $crate::init::pin_project!(find_pinned_fields:
+        $crate::pin_project!(find_pinned_fields:
             @struct_attrs($($struct_attrs)*),
             @vis($vis),
             @name($name),
@@ -127,7 +129,7 @@ macro_rules! pin_project {
         @is_pinned($($is_pinned:ident)?),
         @pinned_drop($($pinned_drop:ident)?),
     ) => {
-        $crate::init::pin_project!(find_pinned_fields:
+        $crate::pin_project!(find_pinned_fields:
             @struct_attrs($($struct_attrs)*),
             @vis($vis),
             @name($name),
@@ -158,7 +160,7 @@ macro_rules! pin_project {
         @is_pinned($($is_pinned:ident)?),
         @pinned_drop($($pinned_drop:ident)?),
     ) => {
-        $crate::init::pin_project!(find_pinned_fields:
+        $crate::pin_project!(find_pinned_fields:
             @struct_attrs($($struct_attrs)*),
             @vis($vis),
             @name($name),
@@ -189,7 +191,7 @@ macro_rules! pin_project {
         @is_pinned($($is_pinned:ident)?),
         @pinned_drop($($pinned_drop:ident)?),
     ) => {
-        $crate::init::pin_project!(find_pinned_fields:
+        $crate::pin_project!(find_pinned_fields:
             @struct_attrs($($struct_attrs)*),
             @vis($vis),
             @name($name),
@@ -234,8 +236,7 @@ macro_rules! pin_project {
                 __phantom: ::core::marker::PhantomData<fn($name<$($ty_generics)*>) -> $name<$($ty_generics)*>>,
             }
 
-            $crate::init::pin_project!(make_pin_data:
-                @slot($name<$($ty_generics)*>),
+            $crate::pin_project!(make_pin_data:
                 @pin_data(__ThePinData),
                 @impl_generics($($impl_generics)*),
                 @ty_generics($($ty_generics)*),
@@ -244,10 +245,10 @@ macro_rules! pin_project {
                 @not_pinned($($not_pinned)*),
             );
 
-            impl<$($impl_generics)*> __PinData for $name<$($ty_generics)*>
+            unsafe impl<$($impl_generics)*> $crate::init::__private::__PinData for $name<$($ty_generics)*>
             where $($whr)*
             {
-                type PinData = __ThePinData<$($ty_generics)*>;
+                type __PinData = __ThePinData<$($ty_generics)*>;
             }
 
             #[allow(dead_code)]
@@ -265,7 +266,7 @@ macro_rules! pin_project {
                 $($whr)*
             {}
 
-            $crate::init::pin_project!(drop_prevention:
+            $crate::pin_project!(drop_prevention:
                 @name($name),
                 @impl_generics($($impl_generics)*),
                 @ty_generics($($ty_generics)*),
@@ -305,7 +306,6 @@ macro_rules! pin_project {
         }
     };
     (make_pin_data:
-        @slot($slot:ty),
         @pin_data($pin_data:ident),
         @impl_generics($($impl_generics:tt)*),
         @ty_generics($($ty_generics:tt)*),
@@ -314,16 +314,24 @@ macro_rules! pin_project {
         @not_pinned($($(#[$($attr:tt)*])* $fvis:vis $field:ident : $type:ty),* $(,)?),
     ) => {
         #[allow(dead_code)]
-        impl<$($impl_generics)*> $pin_data<$($ty_generics)*> {
+        impl<$($impl_generics)*> $pin_data<$($ty_generics)*>
+        where $($whr)*
+        {
             $(
-                $pvis unsafe fn $p_field<E, W>(
-                    slot: *mut $slot,
-                    init: impl PinInit<$p_type, E, W>,
+                $pvis unsafe fn $p_field<E, W: $crate::init::__private::InitWay>(
+                    slot: *mut $p_type,
+                    init: impl $crate::init::__private::__PinInitImpl<$p_type, E, W>,
                 ) -> ::core::result::Result<(), E> {
+                    unsafe { $crate::init::__private::__PinInitImpl::__pinned_init(init, slot) }
                 }
             )*
             $(
-                $fvis unsafe fn $field() -> () {}
+                $fvis unsafe fn $field<E, W: $crate::init::__private::InitWay>(
+                    slot: *mut $type,
+                    init: impl $crate::init::__private::__InitImpl<$type, E, W>,
+                ) -> ::core::result::Result<(), E> {
+                    unsafe { $crate::init::__private::__InitImpl::__init(init, slot) }
+                }
             )*
         }
     };

rust/kernel/sync/mutex.rs

@@ -35,7 +35,10 @@ macro_rules! new_mutex {
 /// [`struct mutex`]: ../../../include/linux/mutex.h
 /// [init]: ../init/index.html
 #[pin_project]
-pub struct Mutex<T: ?Sized> {
+pub struct Mutex<T>
+where
+    T: ?Sized,
+{
     /// The kernel `struct mutex` object.
     #[pin]
     mutex: Opaque<bindings::mutex>,

rust/kernel/sync/revocable.rs

@@ -107,7 +107,7 @@ where
     F: LockFactory,
 {
     #[pin]
-    inner: F::LockedType<Inner<T>>,
+    inner: <F as LockFactory>::LockedType<Inner<T>>,
 }
 
 /// Safely initialises a [`Revocable`] instance with the given name, generating a new lock class.

rust/kernel/sync/rwsem.rs

@@ -40,7 +40,10 @@ macro_rules! new_rwsemaphore {
 /// [`struct rw_semaphore`]: ../../../include/linux/rwsem.h
 /// [init]: ../init/index.html
 #[pin_project]
-pub struct RwSemaphore<T: ?Sized> {
+pub struct RwSemaphore<T>
+where
+    T: ?Sized,
+{
     /// The kernel `struct rw_semaphore` object.
     #[pin]
     rwsem: Opaque<bindings::rw_semaphore>,

rust/kernel/sync/seqlock.rs

@@ -62,9 +62,9 @@ use core::{cell::UnsafeCell, marker::PhantomPinned, ops::Deref};
 /// }
 /// ```
 #[pin_project]
-pub struct SeqLock<L: ?Sized>
+pub struct SeqLock<L>
 where
-    L: Lock,
+    L: ?Sized + Lock,
 {
     #[pin]
     _p: PhantomPinned,

rust/kernel/sync/spinlock.rs

@@ -83,7 +83,10 @@ macro_rules! new_spinlock {
 /// [`spinlock_t`]: ../../../include/linux/spinlock.h
 /// [init]: ../init/index.html
 #[pin_project]
-pub struct SpinLock<T: ?Sized> {
+pub struct SpinLock<T>
+where
+    T: ?Sized,
+{
     #[pin]
     spin_lock: Opaque<bindings::spinlock>,
 
@@ -274,7 +277,10 @@ macro_rules! new_rawspinlock {
 ///
 /// [`raw_spinlock_t`]: ../../../include/linux/spinlock.h
 #[pin_project]
-pub struct RawSpinLock<T: ?Sized> {
+pub struct RawSpinLock<T>
+where
+    T: ?Sized,
+{
     #[pin]
     spin_lock: Opaque<bindings::raw_spinlock>,