Received-SPF: pass (google.com: domain of linux-kernel+bounces-186220-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
From: mu001999 <mu001999@outlook.com>
To: ojeda@kernel.org,
	boqun.feng@gmail.com
Cc: rust-for-linux@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	mu001999 <mu001999@outlook.com>
Subject: [PATCH] rust: kernel: make impl_has_work compatible with more complex generics
Date: Wed, 22 May 2024 20:27:25 +0800
Message-ID:
 <ME0P282MB48901A79E405F9CF615FF2F1CCEB2@ME0P282MB4890.AUSP282.PROD.OUTLOOK.COM>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: ME0P282MB4890:EE_|ME3P282MB3492:EE_
X-MS-Office365-Filtering-Correlation-Id: 9f23a7b2-5ee9-41ea-9bae-08dc7a5a9378
X-Microsoft-Antispam:
	BCL:0;ARA:14566002|461199019|3430499023|3412199016|440099019|1710799017;
X-Microsoft-Antispam-Message-Info:
	eXu4a/IFoJuCvoW3K5oPeNmB9somzYWp9M4DdVtBm7kIWwscYlENZ1uG4vVz/BJTE/23WmJXIa+mXrZfRnnqvg6LyQPDLUjPUoCJdSy9qQBQpHZ5ijdG8Yx3fzJv39E4pANXp5KfJlumod9jrSDOIfX/XN+s2bnAkBMcNaHn73ecXZFeq/FyyFw+/P7xLMjvtMS80o2s8Qfaem3a67oaAhn0kI5LYkj6Vh/oJHhmGzX02TGBin4OjMSAlUmOiV820lMc6IDLVSWhEHIf9sYU7LhkbhgWHBcrI1llvIh0i7csHCzxCgs0rthaBNf2T0bFikj/kguwNreRWaGHxF/eaRsqEQYeQk7aTqYntKSuejMFDfGuo5Wqa7UFbqT2fOIBlfSsngKpo6jmL7VAqtNSaDybUCbaAfXVM70PsZAiKVAzBFDZea4kBKzMoi6OMHk8jU47g1W8spJTXPOco6RAdsVLv/w8yzLo3dTpDGQpHF8EWDqel+h4PSKAUGisJb4QKJTgo6/EKzj6LuR14X68SwYcLiHompwxAgulYoFCa4wF74Y4PbMA8Zdl4vFR29otQRx4Y6r5Co/Y6KYd/Wb0skMbcBd7Fi8GTcCzjlw4cDA=
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?ZGVh6Np16H4e0AvSXvR2NlC6ldHs/x5KLXq1lodMLRM2/M9FYd7og+LwzWFM?=
 =?us-ascii?Q?jDG0mdHG0AyTNYGOsGjlTaSJC2ppZWKqzbhoj61eJvSOQCBQ4KthKzGUzN8t?=
 =?us-ascii?Q?0+9/bngYStTTgKB9H0j8QfKIoPNM0R1D2gmTYHJxQCt/SSR9FO/QDrstapxQ?=
 =?us-ascii?Q?5wO5RSyUpR7rPNYkoy6pP+eD1Pfwbd0tMKjC8c8wrW07z6v8X7c6v9xQ5bBc?=
 =?us-ascii?Q?YssSUg/6cVVDONGumy5a9eWijiyO54zW6C61ccNxMdYaUzCEeBylMxhpwwO/?=
 =?us-ascii?Q?wsSxn+XYmhPJNMEPatFAtHNypT4syLIhp6fxZYeSKU/WmJ78Y3ZeYu48tkNv?=
 =?us-ascii?Q?EyzzKKnrwT7PuEhBP1mGqrJozUdwNtecy91S3TCXNm4K132wJUczndBVmqva?=
 =?us-ascii?Q?Ok4r5GwF4F09pL0Vk4HlKlN9B0Frf+rfZS/7ABB6H/mlPMjOZuFE0zFadXjj?=
 =?us-ascii?Q?7NLVKt2zQU8v3mA+TS+EqLkU0ZRrBF20kEY6AufZz/P6r5eEyUT+xqcUyv2/?=
 =?us-ascii?Q?WatmZ39aXabl8Sgst3FB3NgbIbj2O7OJf6MmNsunYm6EFEohTaVu+onNCbpC?=
 =?us-ascii?Q?rAswdaEes+Pzck+e9lgYaZh2fxKV79ACftBUBRSfBtt5gXlQFSy2BnpIfyWd?=
 =?us-ascii?Q?gNo6FFH0UIIF3pjwH8gqpq4TpwxBsvk4R+FepelnMjFWz4pcLqKh5od7+1zu?=
 =?us-ascii?Q?uzweyjxEY7lDJmcl9T/hR2VFQ4iyBmgnjYuuJ9M7re7Xoai6YiPsUJjYiINM?=
 =?us-ascii?Q?Qc9CyZYmZk+8R0YIAe80MgP7fdkj3r+YZ3qo4VQxq7Sfj7J/pCmdCt4uPmcr?=
 =?us-ascii?Q?FoDW7v8cLTMrOCaD5XaHNBwES4bluGAcTrE7zeCV0/EK0H59hHSdNB4YWdiJ?=
 =?us-ascii?Q?xzNO+ibNjVQYylXuZmT/h5Vlba9IJA+mkrOxXG+AEhqPEYJPTQ5+ROtmrykG?=
 =?us-ascii?Q?1qtdjQbN1obBwNE0SEqJYKft3D89HviLOf/OjXqBU65PdA/HpX4xsiwL98nZ?=
 =?us-ascii?Q?kMwiTsRVSCVDQWCV3uTXorVhEXZglt2AB62SbUaK0/neyJ0SP/PSr5Lx3dGC?=
 =?us-ascii?Q?U55d28tgaXNCtcFaOB8bsLncjfVIfsXhbB29//dVu3pLDnP9M2oVy+R5VRQ4?=
 =?us-ascii?Q?WTT2Ff/WxssZerYah9658DxSlUQnTFCos5zTl7Pm8ANFGkh+UBLReHuoTcK/?=
 =?us-ascii?Q?bJNPthKGvjIm+k3jJ5znE9KZhF5MdSH0ntD0Ziscc1n/wvv/eDTuvp7a9X8?=
 =?us-ascii?Q?=3D?=
X-OriginatorOrg: outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 9f23a7b2-5ee9-41ea-9bae-08dc7a5a9378
X-MS-Exchange-CrossTenant-AuthSource: ME0P282MB4890.AUSP282.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2024 12:27:42.1646
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa
X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000
X-MS-Exchange-Transport-CrossTenantHeadersStamped: ME3P282MB3492

Signed-off-by: mu001999 <mu001999@outlook.com>
---
 rust/kernel/workqueue.rs | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/rust/kernel/workqueue.rs b/rust/kernel/workqueue.rs
index 1cec63a2aea8..1ff81d88b61d 100644
--- a/rust/kernel/workqueue.rs
+++ b/rust/kernel/workqueue.rs
@@ -482,24 +482,25 @@ unsafe fn work_container_of(ptr: *mut Work<T, ID>) -> *mut Self
 /// use kernel::sync::Arc;
 /// use kernel::workqueue::{self, impl_has_work, Work};
 ///
-/// struct MyStruct {
-///     work_field: Work<MyStruct, 17>,
+/// struct MyStruct<'a, T, const N: usize> {
+///     work_field: Work<MyStruct<'a, T, N>, 17>,
+///     f: fn(&'a [T; N]),
 /// }
 ///
 /// impl_has_work! {
-///     impl HasWork<MyStruct, 17> for MyStruct { self.work_field }
+///     impl{'a, T, const N: usize} HasWork<MyStruct<'a, T, N>, 17> for MyStruct<'a, T, N> { self.work_field }
 /// }
 /// ```
 #[macro_export]
 macro_rules! impl_has_work {
-    ($(impl$(<$($implarg:ident),*>)?
+    ($(impl$({$($generics:tt)*})?
        HasWork<$work_type:ty $(, $id:tt)?>
-       for $self:ident $(<$($selfarg:ident),*>)?
+       for $self:ty
        { self.$field:ident }
     )*) => {$(
         // SAFETY: The implementation of `raw_get_work` only compiles if the field has the right
         // type.
-        unsafe impl$(<$($implarg),*>)? $crate::workqueue::HasWork<$work_type $(, $id)?> for $self $(<$($selfarg),*>)? {
+        unsafe impl$(<$($generics)+>)? $crate::workqueue::HasWork<$work_type $(, $id)?> for $self {
             const OFFSET: usize = ::core::mem::offset_of!(Self, $field) as usize;
 
             #[inline]
@@ -515,7 +516,7 @@ unsafe fn raw_get_work(ptr: *mut Self) -> *mut $crate::workqueue::Work<$work_typ
 pub use impl_has_work;
 
 impl_has_work! {
-    impl<T> HasWork<Self> for ClosureWork<T> { self.work }
+    impl{T} HasWork<Self> for ClosureWork<T> { self.work }
 }
 
 unsafe impl<T, const ID: u64> WorkItemPointer<ID> for Arc<T>
-- 
2.34.1