From nobody Sat Oct 4 14:32:50 2025 Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 560D81D8DE1; Fri, 15 Aug 2025 05:32:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755235953; cv=none; b=c+rMDDIqQaT3waOhsmrL3rmqNerv69RQ1arFjj0eOuXh8BMZEe8sGHMMKbsX7L3iYpIN6GlUyS+7SumNmT6ypKitNwmlwjgmK+13OsGuYq40QImOEBw+ZLdveh5uDo2y/mJdzICsryURVAO3YUMg3v4tL/1Es4B3mIG6atPotVU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755235953; c=relaxed/simple; bh=ObcRfBzSktAO/7XMRemg2S+7QI34iJ9KLPzc/3sgmxo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=OV4BgOzvNb7KaGK4Mf1FFI6qWdTTMoH/Q4lK5f6E1zJVwZA44Qbe0yRhfu5ZE/5LLDRXR/V4YHK//4PplawEdZsUaoiFSMBwC7FhFzhy+xUCUPLOm8tQKpUq+6w8CE96cUnnLZMZXQGRnvodGIpbvg0Ar/XI5LcD+AY6pksrHcc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=gIe3Q+rS; arc=none smtp.client-ip=209.85.210.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gIe3Q+rS" Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-76e2e60433eso1356869b3a.0; Thu, 14 Aug 2025 22:32:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755235951; x=1755840751; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4lSopcLI3dVeo/3c4/pQ0iCsVLhFvEVu0yP3LOOzHlY=; b=gIe3Q+rS8fq3TYCoYH8gzFzDbnmpk4/mvPZViUYMWvgUd0FA0aRmpOPLQjUk2AW3k3 DtIFdc4mtmQGKh8bUJb4IDeFDLSyMVEkytWaAx2RzJZfAiLYno9rl9hWxfebAvgYMYbW Ce7tgSzencEVbO6DGKrviyV6DCDrWhX77clgnssWXlSLcMTPMsUr8FH9ZaLy6yjqOO9N eFSxHsinO+lmO9H4xvgvPI2ozmbA7hKcqyIC0vy/isaG5wMjk0PzI/p9lqzG2yhsS7nI MDfCkGMChXlHdncjUYa5+6bVVIZK3lpGnRJ6WUnxRQDglkShLrCkCF10td7wD64oYhbU IipQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755235951; x=1755840751; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4lSopcLI3dVeo/3c4/pQ0iCsVLhFvEVu0yP3LOOzHlY=; b=l5gvdOJGKw9MCByuPEITvoH3yB77sBtISOpCgEDv+zPOYRWxgvzMnVw03nhPMxSbKt QOm+7i0HnRsjzPkbx5XEF5xfx/mZ6jqhFOxaAv92NKfR/sa1vbiuyHv2k1U5Kj1+22Wo Sh+kW70bl7NYW9QpDbduw4ewGc2P4qoe06vDFbJk5XxlO9YndJADvALb0bCqw/rxYF+k N+a+6RjYFj5t1hNnS8nYHJ15X2Jv0AB/V9/iyq1p8IPKOO+hQOhSEHIJ/oWCX21irM6B 0V2eluRrZIzImjbLHC+U7teu9/6uj4oUDVrS9mC4VGyFwJwdoaQimiaB7B9XBby2uSud gy0Q== X-Forwarded-Encrypted: i=1; AJvYcCUOw7ewMr7m9r3/kwHsv28P2QlFQX0RbQUaJw85PpmY8Q7tW2/H/NLlkhPF8iPlMyH07ievzdM01iIF2/9Cjg==@vger.kernel.org X-Gm-Message-State: AOJu0Yw1WQng9R+mIRzs9LQMkbFdIuHmpG4wRjI9gZNisiuZq9vTdSjw Ls03hvq6IReXB7UgqDcg6/Bcx2OwWEqzhkQj5+UreB+qWvoRQEXDs6rL X-Gm-Gg: ASbGnctHwTDjbPdnxWJ2Vr0Su8PX0rhMdVo/7fGvDIy0LAeP/VQ+96WwiUSWEPNKLJc FT8+4Asa01VPjWYIhZRMpRsuP1nwPDB5gN4DAEBTS5PhRbK0mcF1Jj083TFT3jcRz6u5wgnTniu tlRawnst4onwUYO/WIYjTQNkve03Abzugf2gvqMkrswUX+lWQ3RLY0r+z7s+bpWs77uU3c1KlUv KIkOQPH8PAWg1Lb6u3TDMGcITIHmBERODiVqClTVvvw3pbykgL+9VshBFPEM/NfQkUcfI2Cx5vL 3ALiddU0POLVfn0r83pVy8ydHX9nUJ2siP5uj4T15CYvVr68drakW73Ujseq92wj0T5NDYmQzmw 0haGyF1pkxNoooqGAA7jF30Z+Q6riCW6O+Emqemo1Bm8= X-Google-Smtp-Source: AGHT+IEnEgL31QptJeXRJQyeWlFiXftFFWkzI6byVkMOjxMkpQiiFpcuDy0n02liiVDRtTpWNELp8w== X-Received: by 2002:a05:6a00:180e:b0:748:e38d:fecc with SMTP id d2e1a72fcca58-76e44838c78mr1004327b3a.22.1755235951434; Thu, 14 Aug 2025 22:32:31 -0700 (PDT) Received: from localhost.localdomain ([112.149.32.52]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-76e4556692bsm335234b3a.61.2025.08.14.22.32.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Aug 2025 22:32:31 -0700 (PDT) From: Jesung Yang To: Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Alexandre Courbot Cc: linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, nouveau@lists.freedesktop.org, Jesung Yang Subject: [PATCH v2 1/5] rust: macros: allow conversion from `&T` to `TokenStream` Date: Fri, 15 Aug 2025 05:32:11 +0000 Message-Id: X-Mailer: git-send-email 2.39.5 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Implement the `ToTokens` trait for `&T` where `T` implements `ToTokens`. This allows users to use the `quote!()` macro with references directly, avoiding the need to clone values. Tested-by: Alexandre Courbot Signed-off-by: Jesung Yang Reviewed-by: Alice Ryhl --- rust/macros/quote.rs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rust/macros/quote.rs b/rust/macros/quote.rs index 92cacc4067c9..8a89f0b1e785 100644 --- a/rust/macros/quote.rs +++ b/rust/macros/quote.rs @@ -7,6 +7,12 @@ pub(crate) trait ToTokens { fn to_tokens(&self, tokens: &mut TokenStream); } =20 +impl ToTokens for &T { + fn to_tokens(&self, tokens: &mut TokenStream) { + (*self).to_tokens(tokens); + } +} + impl ToTokens for Option { fn to_tokens(&self, tokens: &mut TokenStream) { if let Some(v) =3D self { --=20 2.39.5 From nobody Sat Oct 4 14:32:50 2025 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A4B411D8DE1; Fri, 15 Aug 2025 05:32:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755235959; cv=none; b=AtkPfGevXexRZSMxfE3PN6D3bY69Ri/3Z3qI5yJHWlB8lkn/4G9JY0SauOHLuZeBS3jIgKdQTU6rnU6h0uYAsrHHvIhRXHZO2+mQqe/V96QKd9UMeWCeSRMCYOxHj5jdp22InFf9XOInE8z5BY/NYyWivfdjyoLl1UMIAZa4Z0M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755235959; c=relaxed/simple; bh=Y+Yfz9Dw4Ufpsqr/U4oC6W7Qc4yAJ1hU21nEBVZaTU8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=UubMR6YF3Dk/jNRbGM02qYkwJI7dq86O7iyDzsQ/b7D8zuHhkERb+DUZQLGr5Rapxk1KKEv81coQAkZ5eY3Vx3m9dEQlT3XhyzX5WS739J1YqiwsiG906V38eJP7FP+QVsTtBfBRglK8bA2zyCDVWPKhRGovstifviVDifjnFCU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=a2VxM+FZ; arc=none smtp.client-ip=209.85.210.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="a2VxM+FZ" Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-76e2ebe86ecso2026417b3a.3; Thu, 14 Aug 2025 22:32:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755235957; x=1755840757; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QXSg086tVDmosf88eO3jx6G+rWDU/dGxOYa3gmyNHdQ=; b=a2VxM+FZTY5BtE5TwAlV6QXHd2FkLLYte54X9aNQ3/fce7VH62nhbZciQlm/+7FD45 a6uJwXBZQ0BY3NhUWfem2xB+bU4vJjbn353LjsMlCTK5YrvQaWsauht+QR+eXYKUCtX2 fKPVOdP5OspoTn0uFYkqeVeJvkrSdiSwYwo8ewVHh+byEZSvomS8jQwrtbfIt2hUguGh VUF6QRMEpJiJtgR8mqty1G+K7cNtd/ftbFjtHIJXQt2RwTAqEBdSjq3Okx3KP25SGZ0K bv2tLR8eee3joW1C9vYTkENgBN/lrRl9PJ86WY6N1AaySjnDQoz8ZvYYTLIIdc/fnALc D64w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755235957; x=1755840757; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QXSg086tVDmosf88eO3jx6G+rWDU/dGxOYa3gmyNHdQ=; b=vuVPWhn2PpJdECEc4lzwZJR1C7iyMOIJiGcb98OKgWTEjOtsuUqq/uYdQS3lxOWLUq XCLac+XdogoYiHHe9T8JEBTd8bJDcAOvRPEtXmBa1KrY9IuNzWnvwZshonq+DmcUoMQc ij+kDjBd+y1OPG257p/FAhZOC+tkpVEu1RCfsRaEVhgiOj9QOIlcic/PLXzx6GMzzG4I MflFa8NoGKaQs9lWB/Ez0IxqIQUU9MgNUEqrM9PkVMARyGULj7UZ8o60PBh//naghPhX JK8x32evurEDoNyGtte1rmjt3dC0SsqkNVGdNUK3rQ/hEHT0RufUhRLotmfnibfmmZ4S RE+w== X-Forwarded-Encrypted: i=1; AJvYcCWMYkRbTijapfQJVvWmTQnBngoA7V2Agfias+HHWGG6TmH8BZjNXNw0FfCwgyVBi12u6sJLNFXzpG7+kzIOsw==@vger.kernel.org X-Gm-Message-State: AOJu0YznhZR+gA/Up9dh2BpQJVmerDkzL3+sQOanRYxQ6QDGpp0e4BKJ WaTT9pzNXVEih/2Du2g25jpRpS79IvGnpm8aUcq1P5wS83s83H8w8pUf X-Gm-Gg: ASbGncta65Q6nNy+0WfPBPyJ41O5iUl4P2wuTCvuYbrEbZ1szXKh6vQTWXnOQW+bfKh 4khwKWe350DxUlbBhsolCY9mUoSnxHY7h0Rbq9Iw2gcGdGbnrM/I2yGcT3SgZViDzGBPidCIymi PxZLq7dwWtHBKJsyqCjNi+HFcISbDEhbobgwgV4N2AcWc4vzxXmsN05CbOjUWckBppUxKjSGBfe gjvyAC96B6IAwDN+pWBZCVnbvKwukP7xuVl/6VSwUA2nNtzqwoo9G49oUWRR1NM7OuDNAXO7nNU wWaAA98eaQjkDDTXW7F01yRBEeIcOvO5et4k7Co2YNFosc9ELODlBggmpeOadPAWX8/NjgyXWoz 4GQtetWxZ9shI2WTIkGcJF76WLeOrh2AKJhw2Pwabb9c= X-Google-Smtp-Source: AGHT+IG4HU8MP0xJ+330waF1yTeFRAjq/5O+h8g/Lloz/jm6OtLbcslz6UUMOu+0mWZdRzPENl618A== X-Received: by 2002:a05:6a00:14c8:b0:76b:42e5:fa84 with SMTP id d2e1a72fcca58-76e446ee0afmr1193988b3a.7.1755235956849; Thu, 14 Aug 2025 22:32:36 -0700 (PDT) Received: from localhost.localdomain ([112.149.32.52]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-76e4556692bsm335234b3a.61.2025.08.14.22.32.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Aug 2025 22:32:36 -0700 (PDT) From: Jesung Yang To: Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Alexandre Courbot Cc: linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, nouveau@lists.freedesktop.org, Jesung Yang Subject: [PATCH v2 2/5] rust: macros: extend custom `quote!()` macro Date: Fri, 15 Aug 2025 05:32:12 +0000 Message-Id: <948a28f26a0e9924d82eb1d8d377e3ddc7335b24.1755235180.git.y.j3ms.n@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Extend the `quote_spanned!()` macro to support additional punctuation tokens: `->`, `<`, `>`, and `=3D=3D`. This symbols are commonly needed when dealing with functions, generic bounds, and equality comparisons. Tested-by: Alexandre Courbot Signed-off-by: Jesung Yang Reviewed-by: Alice Ryhl --- rust/macros/quote.rs | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/rust/macros/quote.rs b/rust/macros/quote.rs index 8a89f0b1e785..24764b04a07d 100644 --- a/rust/macros/quote.rs +++ b/rust/macros/quote.rs @@ -150,6 +150,36 @@ macro_rules! quote_spanned { )); quote_spanned!(@proc $v $span $($tt)*); }; + (@proc $v:ident $span:ident -> $($tt:tt)*) =3D> { + $v.push(::proc_macro::TokenTree::Punct( + ::proc_macro::Punct::new('-', ::proc_macro::Spacing::Joint) + )); + $v.push(::proc_macro::TokenTree::Punct( + ::proc_macro::Punct::new('>', ::proc_macro::Spacing::Alone) + )); + quote_spanned!(@proc $v $span $($tt)*); + }; + (@proc $v:ident $span:ident < $($tt:tt)*) =3D> { + $v.push(::proc_macro::TokenTree::Punct( + ::proc_macro::Punct::new('<', ::proc_macro::Spacing::Alone) + )); + quote_spanned!(@proc $v $span $($tt)*); + }; + (@proc $v:ident $span:ident > $($tt:tt)*) =3D> { + $v.push(::proc_macro::TokenTree::Punct( + ::proc_macro::Punct::new('>', ::proc_macro::Spacing::Alone) + )); + quote_spanned!(@proc $v $span $($tt)*); + }; + (@proc $v:ident $span:ident =3D=3D $($tt:tt)*) =3D> { + $v.push(::proc_macro::TokenTree::Punct( + ::proc_macro::Punct::new('=3D', ::proc_macro::Spacing::Joi= nt) + )); + $v.push(::proc_macro::TokenTree::Punct( + ::proc_macro::Punct::new('=3D', ::proc_macro::Spacing::Alo= ne) + )); + quote_spanned!(@proc $v $span $($tt)*); + }; (@proc $v:ident $span:ident =3D $($tt:tt)*) =3D> { $v.push(::proc_macro::TokenTree::Punct( ::proc_macro::Punct::new('=3D', ::proc_macro::Spacing::Alo= ne) --=20 2.39.5 From nobody Sat Oct 4 14:32:50 2025 Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CB1551D8DE1; Fri, 15 Aug 2025 05:32:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755235964; cv=none; b=ifQ8Od7Xoc7n8Puy94VH2wPXi/0/2HALC+LrAihpve5UDVdIaTfJS1zgljEinEUFkx2CNvXWbuOQXMmO9nJZwTMmbVvepebqK8Yx33iBQIUVq11U+GDDm7lk7KyQCMUsEa8NUL/T6FOS+DHp+xemsBgWElkZlxMW5DKW/RDmrt8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755235964; c=relaxed/simple; bh=R434aX8WU3PIalfyTn2zvO3h3n8WODm9xszGH8ueP3U=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=dLX3Fk+zV72UnV2BeqD8JEg1T4sfxIPZ+lfyYOOTyMen6zO/aLUnDURl0by9daDEkMucbUjQRq05j8jwII9qMkLEACgl+AiIb9BCdEyoEzoaoIt2IkVJmN0lwqwZpuZUkSNtoo7b7R/PGj2eePGJ2m4liureksm13L1An3sFAHs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ejnVs7Jt; arc=none smtp.client-ip=209.85.210.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ejnVs7Jt" Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-76e2e8e54f8so1564318b3a.1; Thu, 14 Aug 2025 22:32:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755235962; x=1755840762; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5ItkcH2oOrHmGXKS1kIzQCIhIchwgBZlnH8595tjW2Y=; b=ejnVs7JtdPoa2ypeTlxISDsu//EKAh/0XXLtt+hO1JYAMBYfVa1f4dTjbSb81D9+PE 5cGAWGrDqSjkVQ0Ad+INmAXOM8yh4aUxbwTDJPZWRHgBvkVQdrgNmRX0Volea5KOeDMz 6tX6E3XqoX9QnqllfvDvsZE69bXRZ3vS8tdRunCyTAVJbFV8nxdjA5nA/C89gPDcsgPP 7gCeTXCcUJSCwQWtAAP6UcNdZuYwcjGfda8yS/XUZfyLBvyh7hwkqPwlYmlKvo9jRfxN ikY+7/9/gDJmgYga+NFr21mJFNhISAU/TcL1ZD01nNDQSGRNe6Z0Q6xlz5XSBY8iC45d bOJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755235962; x=1755840762; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5ItkcH2oOrHmGXKS1kIzQCIhIchwgBZlnH8595tjW2Y=; b=IaOvAVXgCHWulNraoQAC+ZlWYvPBBDNL7bioa/S659SDjn4XDu3obj2bJV+niMza72 NzaPRfBeGCDUM4cqkEj8ttFfQKnEnM4HCfHm6bPPlDfeM000qIOpyUONL6HPPSJ6dzug PzDNAULgYRyF4b2vl0TSYCm4GQmeX4FyLpdeYYNP7Xl/PXt6FJLskRt44HnUcoFM9IRA v4uKb6/6JpEEGlVq3bUTa7AHVJxbeBdTxQQ/aM+m9Zdc5gKEr6FZHgNb0KR7iVCdjufv QeI4AOTdiRZCMSCCEPl+xuQVhamdnSfv2IXIfjXQEom7Zu/95I32voFentOz7b/DD1eY fPmA== X-Forwarded-Encrypted: i=1; AJvYcCVPn5TECwHp1OuvknyTWfRyZ1jKwDLbilKGuAz3HkVfwSRmnGrRCLykZFGLQxW6jWnPstQEs2NRERNoXHD1bA==@vger.kernel.org X-Gm-Message-State: AOJu0Yy/0vvLbBA52mHFc+VOvrZpXWUx+vZ7qvOSb8x+PzFXMMZ9ymjv dgcU8HbtW+Yr1sMAriUj03EhDvuIMOzwDzsUfP6t897CqHokw4DMLxCN X-Gm-Gg: ASbGnctucd8G4n1IfbUvLM5c9RUoz1JnakqOV72HqmpAKwmiwYBAjqcU3KZ5HxJ9135 YfzDcObqw11B4j6nmNR+MvsyjCbJPTYB2JcAddW7UOTKAPBQ1HLootnfaIWLJips1gBgLbmU/rW 5GvVdEnfbx6GftyZV/1D02ZFRoyl/lE0139P/IiK2nzgWnr5SvjIXolR2U0sc0MbnV2KridvYki gL+BWf0FvC/dKfHzm+pcQtbulD+R5kni00v63in/xJkJtCP02G0eMGQU9kjK/edUDHvOHW9GRB2 6JDZwUg7CWTqrcQW7KX5xUYb0fhb1onDhwJ0bHSAM6xk+yLhduOJHr1GwiBLgwNGc3ZfbRqS4qC icIBqN7RXhj9m2r9KQCV7M583CJ1kCwgt2dc7sZM676nwcMMgzqKM7Q== X-Google-Smtp-Source: AGHT+IG6RpS5kBDo1uNCaTTuFsahy7gN7SvHmXtqbjLO2J8QO2AfC+R3FC64Kl85jAXYtBoEFXRCqg== X-Received: by 2002:a05:6a00:92a4:b0:76b:fcac:f2ad with SMTP id d2e1a72fcca58-76e44847105mr1187592b3a.20.1755235961994; Thu, 14 Aug 2025 22:32:41 -0700 (PDT) Received: from localhost.localdomain ([112.149.32.52]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-76e4556692bsm335234b3a.61.2025.08.14.22.32.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Aug 2025 22:32:41 -0700 (PDT) From: Jesung Yang To: Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Alexandre Courbot Cc: linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, nouveau@lists.freedesktop.org, Jesung Yang Subject: [PATCH v2 3/5] rust: macros: prefix variable `span` with underscore Date: Fri, 15 Aug 2025 05:32:13 +0000 Message-Id: <1455d8540acc62ad3acc1dd8ead71b1ad38935da.1755235180.git.y.j3ms.n@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Prefix the variable `span` in `quote_spanned!()` macro with an underscore to silence unused variable warnings. The warning occurs when the macro is used without any uninterpolated identifiers. For example: // Triggers a warning: "unused variable: `span`" quote! { #foo } // This is fine quote! { Some(#foo) } There is no good reason to disallow such quoting patterns, so fix the warning instead. Tested-by: Alexandre Courbot Signed-off-by: Jesung Yang Reviewed-by: Alice Ryhl --- rust/macros/quote.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rust/macros/quote.rs b/rust/macros/quote.rs index 24764b04a07d..75367a93e0d3 100644 --- a/rust/macros/quote.rs +++ b/rust/macros/quote.rs @@ -57,8 +57,8 @@ macro_rules! quote_spanned { #[allow(clippy::vec_init_then_push)] { tokens =3D ::std::vec::Vec::new(); - let span =3D $span; - quote_spanned!(@proc tokens span $($tt)*); + let _span =3D $span; + quote_spanned!(@proc tokens _span $($tt)*); } ::proc_macro::TokenStream::from_iter(tokens) }}; --=20 2.39.5 From nobody Sat Oct 4 14:32:50 2025 Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 672B629D27F; Fri, 15 Aug 2025 05:32:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755235970; cv=none; b=YEVLKyNVk+evYEIPrukPaxd4v7T5jpiBHNkFJUIghr+/9JevMWBBDul31YpFJ8YlylOyR7hkX/AG1DSzbyyKZOqVaNvOxkleknsDzqKtTH1HPv7aOB5IbwjIdzpIMjRH0kDdDHdfjiIL1g7lzk1+iIBjQaoeX4aIl8hMePqk9a4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755235970; c=relaxed/simple; bh=Q1QijZaIyNilZgfcTR3okvN6t2dytzDlyw7S4CQUlBw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=r6tjtPstXUbIdVD09VSm3qtUBJo0oyZIdAtV+SrWENDiij9M8dPNBs3qgJM5qdkDmDiEZDqU4kp7MPlk5PtUi+cTtSyAodPklSmciw+SVjte1SPokypEgBWlnf+9EARPRgdXxbWb9VK4Zdy+xXSdId9os69thvAQ1yclalJqsUs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=h7Dbuujc; arc=none smtp.client-ip=209.85.215.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="h7Dbuujc" Received: by mail-pg1-f169.google.com with SMTP id 41be03b00d2f7-b472fd93b4aso62433a12.0; Thu, 14 Aug 2025 22:32:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755235967; x=1755840767; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=v++t53P4EgG48rVd8q9X8cTEHlETjx3oHYParZ2OE2U=; b=h7Dbuujc5sN/3QG8PNEksDYxdKGq174z8NGhEYbq8ZLqCAfbomLiMaZS/zbDfXIANu VMSO6pzPyrnQ3tFmRKt6Qbcl/htV8VFDQzZ6fEKfJA+QoyIE4Plnjsaks+AKHjC5FUGU H8fBXPFGRsE2YPQGshgxkoR2PfKgTYxZufnQ6wrMOoqgK6m3Wyv6+CdDYj4fNPaw+ksB WZ2df0rFlogzWPSG4da4H5jtQudkNl21iudZoTxOE7VC5gmWyGYQDCQsptkZm/ueSYxj b1KXNHKHhTZbbePQpeby3+XqyBKzTraorwzWwZsx/SGbQwCWRTw1gtkSdiXgSnWpVik1 PhEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755235967; x=1755840767; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=v++t53P4EgG48rVd8q9X8cTEHlETjx3oHYParZ2OE2U=; b=U0ru2qGP6Ciyi2R18lPuHh7sWLHLqs1olsvCM4d/PHCR+xAsxMNXoPn1GcW2eb8TFf +fCgWogtRAz/rCsOCGwpDjr8Rmx/JLSGMw+hnxw+QrKKTPgSq7aZJNu8BHMUTcf2kiXG Qfonz/DH5OrKpl3iQTrdzELnEhmSmRAAU+NUJxCQWhFHbZBShLy71ZS6tSEsFZXlHPHW JELtXI9AorJs25yn8a58Hsx/7UL3z+dmih/8NpcdRxSTNQZ9AIlSsxxlAoMtltEv+TbX BTBgrfaRwCJJFQP9K09vp5xp1aE7Fp9NLF1E1XOyp82LHRet0CGvRiKUJkqbXVoSCHvR zdGw== X-Forwarded-Encrypted: i=1; AJvYcCWevAbJr9nBQa4wh/15Raj+Ee+8+i/hcEF23VSWTANV9+zgW0NNDVIJ+i+KrTTF9myyCQ7swZmbelxQ33Qh4Q==@vger.kernel.org X-Gm-Message-State: AOJu0YzvizjoMQMhYkCEqfKvBz5RAl0PudYGNoRRYKkcW69mjzDsO3b2 wMItN6mbe8eyKffqFlrxDsCz38tZVno6L0ptuac+VcQDKN9nU5EclFdf X-Gm-Gg: ASbGncubQBNimoZvjmWncl2hHqN3fVyh6QLW292PuUgVuhsYVf8jy3T+bvrXv5HDWN2 tBrjQTnR8XtkYiNRcS/OXH6rOyQfSKsyICQhTe91jcPyro4ey41Aghikbm5TR/dv+vERGZYaSMe cP/OZyC7LtlE7uG0OqKyaHZbtAiHjEjVJS0EJlfs00Qpi6KVQWczE8hcuF/+IfeoeGbB1QHFst4 r7jEptMBQMxkws78XuyN4heOZq1BKGsIhHBYRElrwIif/xd9uPNxFgFaXXRaPUM0RsIavFlD6ZC AfLbD2r3U2jaScNNarrv1OGuC9ku7RIm1S5qgXfXK3OjSiJT1dOzjkGnn0rasIS6vv4pZaQ+lAT X45T4/7T+e2ESTYPGVOeRGJA4rYVjeXTUQZ/NN3u3Gr119seL0pkfUw== X-Google-Smtp-Source: AGHT+IEuP38negAiTWY+byl6T/38/ZPMacDl/61+NORQDMLLFI1r5I/hC9/JTBTB8whMfGGc35G05g== X-Received: by 2002:a17:903:228a:b0:240:1bca:54 with SMTP id d9443c01a7336-2446d861ff2mr14514005ad.35.1755235967324; Thu, 14 Aug 2025 22:32:47 -0700 (PDT) Received: from localhost.localdomain ([112.149.32.52]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-76e4556692bsm335234b3a.61.2025.08.14.22.32.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Aug 2025 22:32:47 -0700 (PDT) From: Jesung Yang To: Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Alexandre Courbot Cc: linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, nouveau@lists.freedesktop.org, Jesung Yang Subject: [PATCH v2 4/5] rust: macros: add derive macro for `TryFrom` Date: Fri, 15 Aug 2025 05:32:14 +0000 Message-Id: X-Mailer: git-send-email 2.39.5 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Introduce a procedural macro `TryFrom` to automatically implement the `TryFrom` trait for unit-only enums. This reduces boilerplate in cases where numeric values need to be interpreted as relevant enum variants. This situation often arise when working with low-level data sources. A typical example is the `Chipset` enum in nova-core, where the value read from a GPU register should be mapped to a corresponding variant. Since a pending RFC [1] proposes adding the `syn` crate [2] as a dependency, keep the parsing logic minimal. Tested-by: Alexandre Courbot Link: https://lore.kernel.org/rust-for-linux/20250304225536.2033853-1-benno= .lossin@proton.me [1] Link: https://docs.rs/syn/latest/syn [2] Signed-off-by: Jesung Yang Reviewed-by: Alice Ryhl --- rust/macros/convert.rs | 337 +++++++++++++++++++++++++++++++++++++++++ rust/macros/lib.rs | 124 +++++++++++++++ 2 files changed, 461 insertions(+) create mode 100644 rust/macros/convert.rs diff --git a/rust/macros/convert.rs b/rust/macros/convert.rs new file mode 100644 index 000000000000..0084bc4308c1 --- /dev/null +++ b/rust/macros/convert.rs @@ -0,0 +1,337 @@ +// SPDX-License-Identifier: GPL-2.0 + +use proc_macro::{token_stream, Delimiter, Ident, Span, TokenStream, TokenT= ree}; +use std::iter::Peekable; + +#[derive(Debug)] +struct TypeArgs { + helper: Vec, + repr: Option, +} + +const VALID_TYPES: [&str; 12] =3D [ + "u8", "u16", "u32", "u64", "u128", "usize", "i8", "i16", "i32", "i64",= "i128", "isize", +]; + +pub(crate) fn derive_try_from(input: TokenStream) -> TokenStream { + derive(input) +} + +fn derive(input: TokenStream) -> TokenStream { + let derive_target =3D "TryFrom"; + let derive_helper =3D "try_from"; + + let mut tokens =3D input.into_iter().peekable(); + + let type_args =3D match parse_types(&mut tokens, derive_helper) { + Ok(type_args) =3D> type_args, + Err(errs) =3D> return errs, + }; + + // Skip until the `enum` keyword, including the `enum` itself. + for tt in tokens.by_ref() { + if matches!(tt, TokenTree::Ident(ident) if ident.to_string() =3D= =3D "enum") { + break; + } + } + + let Some(TokenTree::Ident(enum_ident)) =3D tokens.next() else { + return format!( + "::core::compile_error!(\"`#[derive({derive_target})]` can onl= y \ + be applied to an enum\");" + ) + .parse::() + .unwrap(); + }; + + let mut errs =3D TokenStream::new(); + + if matches!(tokens.peek(), Some(TokenTree::Punct(p)) if p.as_char() = =3D=3D '<') { + errs.extend( + format!( + "::core::compile_error!(\"`#[derive({derive_target})]` \ + does not support enums with generic parameters\");" + ) + .parse::() + .unwrap(), + ); + } + + let Some(variants_group) =3D tokens.find_map(|tt| match tt { + TokenTree::Group(g) if g.delimiter() =3D=3D Delimiter::Brace =3D> = Some(g), + _ =3D> None, + }) else { + unreachable!("Enums have its corresponding body") + }; + + let enum_body_tokens =3D variants_group.stream().into_iter().peekable(= ); + let variants =3D match parse_enum_variants(enum_body_tokens, &enum_ide= nt, derive_target) { + Ok(variants) =3D> variants, + Err(new_errs) =3D> { + errs.extend(new_errs); + return errs; + } + }; + + if !errs.is_empty() { + return errs; + } + + if type_args.helper.is_empty() { + // Extract the representation passed by `#[repr(...)]` if present. + // If nothing is specified, the default is `Rust` representation, + // which uses `isize` for the discriminant type. + // See: https://doc.rust-lang.org/reference/items/enumerations.htm= l#r-items.enum.discriminant.repr-rust + let ty =3D type_args + .repr + .unwrap_or_else(|| Ident::new("isize", Span::mixed_site())); + impl_try_from(&ty, &enum_ident, &variants) + } else { + let impls =3D type_args + .helper + .iter() + .map(|ty| impl_try_from(ty, &enum_ident, &variants)); + quote! { #(#impls)* } + } +} + +fn parse_types( + attrs: &mut Peekable, + helper: &str, +) -> Result { + let mut helper_args =3D vec![]; + let mut repr_arg =3D None; + + // Scan only the attributes. As soon as we see a token that is + // not `#`, we know we have consumed all attributes. + while let Some(TokenTree::Punct(p)) =3D attrs.peek() { + if p.as_char() !=3D '#' { + unreachable!("Outer attributes start with `#`"); + } + attrs.next(); + + // The next token should be a `Group` delimited by brackets. + // (e.g., #[try_from(u8, u16)]) + // ^^^^^^^^^^^^^^^^^^^ + let Some(TokenTree::Group(attr_group)) =3D attrs.next() else { + unreachable!("Outer attributes are surrounded by `[` and `]`"); + }; + + let mut inner =3D attr_group.stream().into_iter(); + + // Extract the attribute identifier. + // (e.g., #[try_from(u8, u16)]) + // ^^^^^^^^ + let attr_name =3D match inner.next() { + Some(TokenTree::Ident(ident)) =3D> ident.to_string(), + _ =3D> unreachable!("Attributes have identifiers"), + }; + + if attr_name =3D=3D helper { + match parse_helper_args(inner, helper) { + Ok(v) =3D> helper_args.extend_from_slice(&v), + Err(errs) =3D> return Err(errs), + } + } else if attr_name =3D=3D "repr" { + repr_arg =3D parse_repr_args(inner); + } + } + + Ok(TypeArgs { + helper: helper_args, + repr: repr_arg, + }) +} + +fn parse_repr_args(mut tt_group: impl Iterator) -> Opt= ion { + // The next token should be a `Group` delimited by parentheses. + // (e.g., #[repr(C, u8)]) + // ^^^^^^^ + let Some(TokenTree::Group(args_group)) =3D tt_group.next() else { + unreachable!("`repr` attribute has at least one argument") + }; + + for arg in args_group.stream() { + if let TokenTree::Ident(type_ident) =3D arg { + if VALID_TYPES.contains(&type_ident.to_string().as_str()) { + return Some(type_ident); + } + } + } + + None +} + +fn parse_helper_args( + mut tt_group: impl Iterator, + helper: &str, +) -> Result, TokenStream> { + let mut errs =3D TokenStream::new(); + let mut args =3D vec![]; + + // The next token should be a `Group`. + // (e.g., #[try_from(u8, u16)]) + // ^^^^^^^^^ + let Some(TokenTree::Group(args_group)) =3D tt_group.next() else { + return Err(format!( + "::core::compile_error!(\"`{helper}` attribute expects at \ + least one integer type argument (e.g., `#[{helper}(u8)]`)\");" + ) + .parse::() + .unwrap()); + }; + + let raw_args =3D args_group.stream(); + if raw_args.is_empty() { + return Err(format!( + "::core::compile_error!(\"`{helper}` attribute expects at \ + least one integer type argument (e.g., `#[{helper}(u8)]`)\");" + ) + .parse::() + .unwrap()); + } + + // Iterate over the attribute argument tokens to collect valid integer + // type identifiers. + let mut raw_args =3D raw_args.into_iter(); + while let Some(tt) =3D raw_args.next() { + let TokenTree::Ident(type_ident) =3D tt else { + errs.extend( + format!( + "::core::compile_error!(\"`{helper}` attribute expects= \ + comma-separated integer type arguments \ + (e.g., `#[{helper}(u8, u16)]`)\");" + ) + .parse::() + .unwrap(), + ); + return Err(errs); + }; + + if VALID_TYPES.contains(&type_ident.to_string().as_str()) { + args.push(type_ident); + } else { + errs.extend( + format!( + "::core::compile_error!(\"`{type_ident}` in `{helper}`= \ + attribute is not an integer type\");" + ) + .parse::() + .unwrap(), + ); + } + + match raw_args.next() { + Some(TokenTree::Punct(p)) if p.as_char() =3D=3D ',' =3D> conti= nue, + None =3D> break, + Some(_) =3D> { + errs.extend( + format!( + "::core::compile_error!(\"`{helper}` attribute exp= ects \ + comma-separated integer type arguments \ + (e.g., `#[{helper}(u8, u16)]`)\");" + ) + .parse::() + .unwrap(), + ); + return Err(errs); + } + } + } + + if !errs.is_empty() { + return Err(errs); + } + + Ok(args) +} + +fn parse_enum_variants( + mut tokens: Peekable, + enum_ident: &Ident, + derive_target: &str, +) -> Result, TokenStream> { + let mut errs =3D TokenStream::new(); + + let mut variants =3D vec![]; + + if tokens.peek().is_none() { + errs.extend( + format!( + "::core::compile_error!(\"`#[derive({derive_target})]` \ + does not support zero-variant enums\");" + ) + .parse::() + .unwrap(), + ); + } + + while let Some(tt) =3D tokens.next() { + // Skip attributes like `#[...]` if present. + if matches!(&tt, TokenTree::Punct(p) if p.as_char() =3D=3D '#') { + tokens.next(); + continue; + } + + let TokenTree::Ident(ident) =3D tt else { + unreachable!("Enum variants have its corresponding identifier"= ); + }; + + // Reject tuple-like or struct-like variants. + if let Some(TokenTree::Group(g)) =3D tokens.peek() { + let variant_kind =3D match g.delimiter() { + Delimiter::Brace =3D> "struct-like", + Delimiter::Parenthesis =3D> "tuple-like", + _ =3D> unreachable!("Invalid enum variant syntax"), + }; + errs.extend( + format!( + "::core::compile_error!(\"`#[derive({derive_target})]`= does not \ + support {variant_kind} variant `{enum_ident}::{ident}`= ; \ + only unit variants are allowed\");" + ) + .parse::() + .unwrap(), + ); + } + + // Skip through the comma. + for tt in tokens.by_ref() { + if matches!(tt, TokenTree::Punct(p) if p.as_char() =3D=3D ',')= { + break; + } + } + + variants.push(ident); + } + + if !errs.is_empty() { + return Err(errs); + } + + Ok(variants) +} + +fn impl_try_from(ty: &Ident, enum_ident: &Ident, variants: &[Ident]) -> To= kenStream { + let param =3D Ident::new("value", Span::mixed_site()); + + let clauses =3D variants.iter().map(|variant| { + quote! { + if #param =3D=3D Self::#variant as #ty { + ::core::result::Result::Ok(Self::#variant) + } else + } + }); + + quote! { + #[automatically_derived] + impl ::core::convert::TryFrom<#ty> for #enum_ident { + type Error =3D ::kernel::prelude::Error; + fn try_from(#param: #ty) -> Result { + #(#clauses)* { + ::core::result::Result::Err(::kernel::prelude::EINVAL) + } + } + } + } +} diff --git a/rust/macros/lib.rs b/rust/macros/lib.rs index fa847cf3a9b5..569198f188f7 100644 --- a/rust/macros/lib.rs +++ b/rust/macros/lib.rs @@ -14,6 +14,7 @@ #[macro_use] mod quote; mod concat_idents; +mod convert; mod export; mod helpers; mod kunit; @@ -425,3 +426,126 @@ pub fn paste(input: TokenStream) -> TokenStream { pub fn kunit_tests(attr: TokenStream, ts: TokenStream) -> TokenStream { kunit::kunit_tests(attr, ts) } + +/// A derive macro for generating an impl of the [`TryFrom`] trait. +/// +/// This macro automatically derives [`TryFrom`] trait for a given enum. C= urrently, +/// it only supports [unit-only enum]s without generic parameters. +/// +/// [unit-only enum]: https://doc.rust-lang.org/reference/items/enumeratio= ns.html#r-items.enum.unit-only +/// +/// # Notes +/// +/// The macro generates [`TryFrom`] implementations that: +/// - Convert numeric values to enum variants by matching discriminant val= ues. +/// - Return `Ok(VARIANT)` for valid matches. +/// - Return `Err(EINVAL)` for invalid matches (where `EINVAL` is from +/// [`kernel::error::code`]). +/// +/// The macro uses the `try_from` custom attribute or `repr` attribute to = generate +/// corresponding [`TryFrom`] implementations. `try_from` always takes pre= cedence +/// over `repr`. +/// +/// [`kernel::error::code`]: ../kernel/error/code/index.html +/// +/// # Caveats +/// +/// Ensure that every integer type specified in `#[try_from(...)]` is larg= e enough +/// to cover all enum discriminants. Otherwise, the internal `as` casts ma= y overflow. +/// +/// # Examples +/// +/// ## Without Attributes +/// +/// Since [the default `Rust` representation uses `isize` for the discrimi= nant type][repr-rs], +/// the macro implements `TryFrom`: +/// +/// [repr-rs]: https://doc.rust-lang.org/reference/items/enumerations.html= #r-items.enum.discriminant.repr-rust +/// +/// ```rust +/// use kernel::macros::TryFrom; +/// use kernel::prelude::*; +/// +/// #[derive(Debug, Default, PartialEq, TryFrom)] +/// enum Foo { +/// #[default] +/// A, +/// B =3D 0x17, +/// } +/// +/// assert_eq!(Foo::try_from(0isize), Ok(Foo::A)); +/// assert_eq!(Foo::try_from(0x17isize), Ok(Foo::B)); +/// assert_eq!(Foo::try_from(0x19isize), Err(EINVAL)); +/// ``` +/// +/// ## With `#[repr(T)]` +/// +/// The macro implements `TryFrom`: +/// +/// ```rust +/// use kernel::macros::TryFrom; +/// use kernel::prelude::*; +/// +/// #[derive(Debug, Default, PartialEq, TryFrom)] +/// #[repr(u8)] +/// enum Foo { +/// #[default] +/// A, +/// B =3D 0x17, +/// } +/// +/// assert_eq!(Foo::try_from(0u8), Ok(Foo::A)); +/// assert_eq!(Foo::try_from(0x17u8), Ok(Foo::B)); +/// assert_eq!(Foo::try_from(0x19u8), Err(EINVAL)); +/// ``` +/// +/// ## With `#[try_from(...)]` +/// +/// The macro implements `TryFrom` for each `T` specified in `#[try_fro= m(...)]`, +/// which always overrides `#[repr(...)]`: +/// +/// ```rust +/// use kernel::macros::TryFrom; +/// use kernel::prelude::*; +/// +/// #[derive(Debug, Default, PartialEq, TryFrom)] +/// #[try_from(u8, u16)] +/// #[repr(u8)] +/// enum Foo { +/// #[default] +/// A, +/// B =3D 0x17, +/// } +/// +/// assert_eq!(Foo::try_from(0u16), Ok(Foo::A)); +/// assert_eq!(Foo::try_from(0x17u16), Ok(Foo::B)); +/// assert_eq!(Foo::try_from(0x19u16), Err(EINVAL)); +/// ``` +/// +/// ## Unsupported Cases +/// +/// The following examples do not compile: +/// +/// ```compile_fail +/// # use kernel::macros::TryFrom; +/// // Generic parameters are not allowed. +/// #[derive(TryFrom)] +/// enum Foo { +/// A, +/// } +/// +/// // Tuple-like enums or struct-like enums are not allowed. +/// #[derive(TryFrom)] +/// enum Bar { +/// A(u8), +/// B { inner: u8 }, +/// } +/// +/// // Structs are not allowed. +/// #[derive(TryFrom)] +/// struct Baz(u8); +/// ``` +#[proc_macro_derive(TryFrom, attributes(try_from))] +pub fn derive_try_from(input: TokenStream) -> TokenStream { + convert::derive_try_from(input) +} --=20 2.39.5 From nobody Sat Oct 4 14:32:50 2025 Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 74C5C2BE65B; Fri, 15 Aug 2025 05:32:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755235976; cv=none; b=IFRON3AQHjoICxcMXx1TBYFTy8b0+0DGg5+TyLMzD/z/FXLYQxvNi4t8YRVc9nBkPe1PpVhgM1IQ4DsSHMVVTVq1KAQh2BILGxowN2/gZ+ImN8WbTpGa8cfxD51BSsi5Q/7OzNRGwOm+cCOl7CMcmNiDQlZzOkrOmkGuxga/YU0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755235976; c=relaxed/simple; bh=BQlAO40Fkf8jj/Luuxq4Hy8WbOuf4ZzAo8KvzU12f5o=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TqavWEMIlqSjSOC/tMq4+7PkOs1/gpkgm0JB/mSn6gUTCVNaNCMoo1xEKKYqS+59kNuEWZtHlhUcGNFNJbTaje3dWxePTwdWGDPk9yJjZXh6W2avmM5gcvUSWhM2nPROPe6stvhYmxVGH6OPjMIbmpBtAOKgFZTMQGIZQO3XHpw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=M39SLHOE; arc=none smtp.client-ip=209.85.210.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="M39SLHOE" Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-76e2ea94c7dso2178910b3a.2; Thu, 14 Aug 2025 22:32:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755235973; x=1755840773; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QTd2SnS44QbWRezmUmEtQLo0ES7cL0NdhN8U5PrZ/34=; b=M39SLHOEIIf9JpZ1OFFToOnBh9PfbbAm1Zz+YLhalBzCJUcq5tI0XbTXLYmggUM0qS H5eJgmgdofX51sdFDNoqnbdjFsZvqHCFgDNq4YiYEfxiDefLZvvab22+oBeaKZbdvL/3 MG3cKTRZv+MdJ3xoTnMWdnN+ZkOgBR7dCwJu9EZXJfhbevvemxzEcanHsBTIOsqkeT94 TAWUazgeA4M21zjUoI+mWyU8J//nFKoob64qYSq5xEmoO0TM+0UnP/R1EwH/yR+2maoS S0Aa5mXz303DNyQGOKv5s4lgiZA78IT5XXgUhiqFNLDu5oaHmL6gbzoDbqFzwaJ4QbzQ +m2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755235973; x=1755840773; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QTd2SnS44QbWRezmUmEtQLo0ES7cL0NdhN8U5PrZ/34=; b=feu458C4YjbRz7UGFrmqZQQ488kMb6q6fqyCL7nkAOqGJV1/j3zZXOY18JaZiuBhob a/PBYyBeeuGV6GM+n3Pto5hd8WJYXSXKlad+H60ctVG+8QB5a6MMtEtX9JAiqC9kzMYR qw56fiwCkR0wME52IEt3cNQ1Got/XToH3Hqw4sWPRyGddziZGyStciw5Pz1HAvlIrC7+ TW2ryvlnhuyOSgsA3yYD2j+zyEVoXW/dmUtQgxMQrUzQ+YyRsxFZE3ODz8Z+n7tIx/xg FtihFc8jfOmOcIZ6IaUh4+9tU1+RAJbmhjlf6s5ZWLDBHHG5PgeqKL2Q7KO0nyPCamsg HSzg== X-Forwarded-Encrypted: i=1; AJvYcCWJkgGHpZ3Pmv8TMgajWNTHCUHT/TMNYE7Lx0LfZAPTrk2SgsjkeS5pniz84w0Twf2Lyzptpdk4JTTIqeLM+w==@vger.kernel.org X-Gm-Message-State: AOJu0YyewN7J4mwDf/IGU7x19yaDP6f1rSs+LzzWkoxPx4ZyGh4cTSqp ndIXw1Mki4jI9JHERY0YGE3+IZUpVQWJSW/MKHB0mFu0IuPz3jRinL7w X-Gm-Gg: ASbGncuAm7HqdZUaLdA7q+D4L7hPIeFgESn15LmZx1xiGk0LU1ApCqKV01EZ0hd3bAt 3cq9KifjfE7F6AMUggSZ4hR9Hsxj7IxolAjRpyvHQ/P20lk6b+D1VsdmrWxYttccnE/+US0uglV vrUb1FhaczY3D97tYO14WkdclraBT/HhyhHqU+Cg7bLkORT/2JSScP+vo5bdd+ppVH/15i1glvj rucGXgG6J51y33B733hqI0mbn1ldonenpP2NnvAUEo21U+BN0YSn6mbT/BtJ+XmRhU4EVZoScnm RyXQ6gsVJ/qzQRRd2eQR2ulVsrMu7APEbkYcJJ/pXt3T5Num89fOX/dxeMzKCe9HUU1SWymE9yQ bZVhopUp070tZ6VA3wPZJ0/Yvn3tTEPqP2NPGBcRBuCc= X-Google-Smtp-Source: AGHT+IHuZOMmR+ZHN6RawSbyEcHlvGHloyTnjAjRuRVJt3T79TKeciymvac/iLTdRF79wIc9l0ITyA== X-Received: by 2002:a05:6a00:1acd:b0:748:e585:3c42 with SMTP id d2e1a72fcca58-76e447ab3b2mr978211b3a.15.1755235972528; Thu, 14 Aug 2025 22:32:52 -0700 (PDT) Received: from localhost.localdomain ([112.149.32.52]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-76e4556692bsm335234b3a.61.2025.08.14.22.32.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Aug 2025 22:32:52 -0700 (PDT) From: Jesung Yang To: Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Alexandre Courbot Cc: linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, nouveau@lists.freedesktop.org, Jesung Yang Subject: [PATCH v2 5/5] rust: macros: add derive macro for `Into` Date: Fri, 15 Aug 2025 05:32:15 +0000 Message-Id: <042f8ba119337b090e8774355fc77478d86ea8ef.1755235180.git.y.j3ms.n@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Introduce a procedural macro `Into` to automatically implement the `Into` trait for unit-only enums. This reduces boilerplate in cases where enum variants need to be interpreted as relevant numeric values. A concrete example can be found in nova-core, where the `register!()` macro requires enum types used within it to be convertible via `u32::from()` [1]. Note that the macro actually generates `From for T` implementations, where `E` is an enum identifier and `T` is an arbitrary integer type. This automatically provides the corresponding `Into for E` implementations through the blanket implementation. Tested-by: Alexandre Courbot Link: https://lore.kernel.org/rust-for-linux/20250624132337.2242-1-dakr@ker= nel.org/ [1] Signed-off-by: Jesung Yang Reviewed-by: Alice Ryhl --- rust/macros/convert.rs | 36 ++++++++++--- rust/macros/lib.rs | 115 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 145 insertions(+), 6 deletions(-) diff --git a/rust/macros/convert.rs b/rust/macros/convert.rs index 0084bc4308c1..a6ef67ba27c7 100644 --- a/rust/macros/convert.rs +++ b/rust/macros/convert.rs @@ -3,6 +3,12 @@ use proc_macro::{token_stream, Delimiter, Ident, Span, TokenStream, TokenT= ree}; use std::iter::Peekable; =20 +#[derive(Debug)] +enum DeriveTarget { + TryFrom, + Into, +} + #[derive(Debug)] struct TypeArgs { helper: Vec, @@ -13,13 +19,20 @@ struct TypeArgs { "u8", "u16", "u32", "u64", "u128", "usize", "i8", "i16", "i32", "i64",= "i128", "isize", ]; =20 +pub(crate) fn derive_into(input: TokenStream) -> TokenStream { + derive(input, DeriveTarget::Into) +} + pub(crate) fn derive_try_from(input: TokenStream) -> TokenStream { - derive(input) + derive(input, DeriveTarget::TryFrom) } =20 -fn derive(input: TokenStream) -> TokenStream { - let derive_target =3D "TryFrom"; - let derive_helper =3D "try_from"; +fn derive(input: TokenStream, target: DeriveTarget) -> TokenStream { + type ImplFn =3D fn(&Ident, &Ident, &[Ident]) -> TokenStream; + let (derive_target, derive_helper, impl_trait) =3D match target { + DeriveTarget::TryFrom =3D> ("TryFrom", "try_from", impl_try_from a= s ImplFn), + DeriveTarget::Into =3D> ("Into", "into", impl_into as ImplFn), + }; =20 let mut tokens =3D input.into_iter().peekable(); =20 @@ -85,12 +98,12 @@ fn derive(input: TokenStream) -> TokenStream { let ty =3D type_args .repr .unwrap_or_else(|| Ident::new("isize", Span::mixed_site())); - impl_try_from(&ty, &enum_ident, &variants) + impl_trait(&ty, &enum_ident, &variants) } else { let impls =3D type_args .helper .iter() - .map(|ty| impl_try_from(ty, &enum_ident, &variants)); + .map(|ty| impl_trait(ty, &enum_ident, &variants)); quote! { #(#impls)* } } } @@ -335,3 +348,14 @@ fn try_from(#param: #ty) -> Result { } } } + +fn impl_into(ty: &Ident, enum_ident: &Ident, _: &[Ident]) -> TokenStream { + quote! { + #[automatically_derived] + impl ::core::convert::From<#enum_ident> for #ty { + fn from(value: #enum_ident) -> #ty { + value as #ty + } + } + } +} diff --git a/rust/macros/lib.rs b/rust/macros/lib.rs index 569198f188f7..374c1bdb696a 100644 --- a/rust/macros/lib.rs +++ b/rust/macros/lib.rs @@ -427,6 +427,121 @@ pub fn kunit_tests(attr: TokenStream, ts: TokenStream= ) -> TokenStream { kunit::kunit_tests(attr, ts) } =20 +/// A derive macro for providing an impl of the [`Into`] trait. +/// +/// This macro automatically derives [`Into`] trait for a given enum by ge= nerating +/// the relevant [`From`] implementation. Currently, it only supports [uni= t-only enum]s +/// without generic parameters. +/// +/// [unit-only enum]: https://doc.rust-lang.org/reference/items/enumeratio= ns.html#r-items.enum.unit-only +/// +/// # Notes +/// +/// Unlike its name suggests, the macro actually generates [`From`] implem= entations +/// which automatically provide corresponding [`Into`] implementations. +/// +/// The macro uses the `into` custom attribute or `repr` attribute to gene= rate [`From`] +/// implementations. `into` always takes precedence over `repr`. +/// +/// # Caveats +/// +/// Ensure that every integer type specified in `#[into(...)]` is large en= ough to cover +/// all enum discriminants. Otherwise, the internal `as` casts may overflo= w. +/// +/// # Examples +/// +/// ## Without Attributes +/// +/// Since [the default `Rust` representation uses `isize` for the discrimi= nant type][repr-rs], +/// the macro implements `From` for `isize`: +/// +/// [repr-rs]: https://doc.rust-lang.org/reference/items/enumerations.html= #r-items.enum.discriminant.repr-rust +/// +/// ```rust +/// use kernel::macros::Into; +/// use kernel::prelude::*; +/// +/// #[derive(Debug, Default, Into)] +/// enum Foo { +/// #[default] +/// A, +/// B =3D 0x17, +/// } +/// +/// assert_eq!(0isize, Foo::A.into()); +/// assert_eq!(0x17isize, Foo::B.into()); +/// ``` +/// +/// ## With `#[repr(T)]` +/// +/// The macro implements `From` for `T`: +/// +/// ```rust +/// use kernel::macros::Into; +/// use kernel::prelude::*; +/// +/// #[derive(Debug, Default, Into)] +/// #[repr(u8)] +/// enum Foo { +/// #[default] +/// A, +/// B =3D 0x17, +/// } +/// +/// assert_eq!(0u8, Foo::A.into()); +/// assert_eq!(0x17u8, Foo::B.into()); +/// ``` +/// +/// ## With `#[into(...)]` +/// +/// The macro implements `From` for each `T` specified in `#[into(...= )]`, +/// which always overrides `#[repr(...)]`: +/// +/// ```rust +/// use kernel::macros::Into; +/// use kernel::prelude::*; +/// +/// #[derive(Debug, Default, Into)] +/// #[into(u8, u16)] +/// #[repr(u8)] +/// enum Foo { +/// #[default] +/// A, +/// B =3D 0x17, +/// } +/// +/// assert_eq!(0u16, Foo::A.into()); +/// assert_eq!(0x17u16, Foo::B.into()); +/// ``` +/// +/// ## Unsupported Cases +/// +/// The following examples do not compile: +/// +/// ```compile_fail +/// # use kernel::macros::Into; +/// // Generic parameters are not allowed. +/// #[derive(Into)] +/// enum Foo { +/// A, +/// } +/// +/// // Tuple-like enums or struct-like enums are not allowed. +/// #[derive(Into)] +/// enum Bar { +/// A(u8), +/// B { inner: u8 }, +/// } +/// +/// // Structs are not allowed. +/// #[derive(Into)] +/// struct Baz(u8); +/// ``` +#[proc_macro_derive(Into, attributes(into))] +pub fn derive_into(input: TokenStream) -> TokenStream { + convert::derive_into(input) +} + /// A derive macro for generating an impl of the [`TryFrom`] trait. /// /// This macro automatically derives [`TryFrom`] trait for a given enum. C= urrently, --=20 2.39.5