From: "Benno Lossin" <lossin@kernel.org>
To: "Andreas Hindborg" <a.hindborg@kernel.org>
Cc: "Miguel Ojeda" <ojeda@kernel.org>,
"Alex Gaynor" <alex.gaynor@gmail.com>,
"Boqun Feng" <boqun.feng@gmail.com>,
"Gary Guo" <gary@garyguo.net>,
"Björn Roy Baron" <bjorn3_gh@protonmail.com>,
"Benno Lossin" <benno.lossin@proton.me>,
"Alice Ryhl" <aliceryhl@google.com>,
"Masahiro Yamada" <masahiroy@kernel.org>,
"Nathan Chancellor" <nathan@kernel.org>,
"Luis Chamberlain" <mcgrof@kernel.org>,
"Danilo Krummrich" <dakr@kernel.org>,
"Nicolas Schier" <nicolas.schier@linux.dev>,
"Trevor Gross" <tmgross@umich.edu>,
"Adam Bratschi-Kaye" <ark.email@gmail.com>,
rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-kbuild@vger.kernel.org, "Petr Pavlu" <petr.pavlu@suse.com>,
"Sami Tolvanen" <samitolvanen@google.com>,
"Daniel Gomez" <da.gomez@samsung.com>,
"Simona Vetter" <simona.vetter@ffwll.ch>,
"Greg KH" <gregkh@linuxfoundation.org>,
"Fiona Behrens" <me@kloenk.dev>,
"Daniel Almeida" <daniel.almeida@collabora.com>,
linux-modules@vger.kernel.org
Subject: Re: [PATCH v12 2/3] rust: add parameter support to the `module!` macro
Date: Thu, 12 Jun 2025 09:52:30 +0200 [thread overview]
Message-ID: <DAKE43J2GFVF.18KWPFWPZKDM@kernel.org> (raw)
In-Reply-To: <87plfazi13.fsf@kernel.org>
On Wed Jun 11, 2025 at 12:31 PM CEST, Andreas Hindborg wrote:
> "Benno Lossin" <lossin@kernel.org> writes:
>> On Tue May 6, 2025 at 3:02 PM CEST, Andreas Hindborg wrote:
>>> diff --git a/rust/macros/helpers.rs b/rust/macros/helpers.rs
>>> index a3ee27e29a6f..16d300ad3d3b 100644
>>> --- a/rust/macros/helpers.rs
>>> +++ b/rust/macros/helpers.rs
>>> @@ -10,6 +10,17 @@ pub(crate) fn try_ident(it: &mut token_stream::IntoIter) -> Option<String> {
>>> }
>>> }
>>>
>>> +pub(crate) fn try_sign(it: &mut token_stream::IntoIter) -> Option<char> {
>>> + let peek = it.clone().next();
>>> + match peek {
>>> + Some(TokenTree::Punct(punct)) if punct.as_char() == '-' => {
>>
>> Should we also allow a leading `+`?
>
> I would argue no, because rust literals cannot start with `+`.
Makes sense.
>>> + let _ = it.next();
>>> + Some(punct.as_char())
>>> + }
>>> + _ => None,
>>> + }
>>> +}
>>> +
>>> pub(crate) fn try_literal(it: &mut token_stream::IntoIter) -> Option<String> {
>>> if let Some(TokenTree::Literal(literal)) = it.next() {
>>> Some(literal.to_string())
>>> @@ -86,3 +97,17 @@ pub(crate) fn function_name(input: TokenStream) -> Option<Ident> {
>>> }
>>> None
>>> }
>>> +
>>> +/// Parse a token stream of the form `expected_name: "value",` and return the
>>> +/// string in the position of "value".
>>> +///
>>> +/// # Panics
>>> +///
>>> +/// - On parse error.
>>> +pub(crate) fn expect_string_field(it: &mut token_stream::IntoIter, expected_name: &str) -> String {
>>> + assert_eq!(expect_ident(it), expected_name);
>>> + assert_eq!(expect_punct(it), ':');
>>> + let string = expect_string(it);
>>> + assert_eq!(expect_punct(it), ',');
>>
>> This won't allow omitting the trailing comma.
>
> This is in line with the rest of the module macro.
Then we should change that:
https://github.com/Rust-for-Linux/linux/issues/1172
>>> + string
>>> +}
>>
>> [...]
>>
>>> @@ -186,33 +336,35 @@ pub(crate) fn module(ts: TokenStream) -> TokenStream {
>>> let info = ModuleInfo::parse(&mut it);
>>>
>>> let mut modinfo = ModInfoBuilder::new(info.name.as_ref());
>>> - if let Some(author) = info.author {
>>> - modinfo.emit("author", &author);
>>> + if let Some(author) = &info.author {
>>> + modinfo.emit("author", author);
>>> }
>>> - if let Some(authors) = info.authors {
>>> + if let Some(authors) = &info.authors {
>>> for author in authors {
>>> - modinfo.emit("author", &author);
>>> + modinfo.emit("author", author);
>>> }
>>> }
>>> - if let Some(description) = info.description {
>>> - modinfo.emit("description", &description);
>>> + if let Some(description) = &info.description {
>>> + modinfo.emit("description", description);
>>> }
>>> modinfo.emit("license", &info.license);
>>> - if let Some(aliases) = info.alias {
>>> + if let Some(aliases) = &info.alias {
>>> for alias in aliases {
>>> - modinfo.emit("alias", &alias);
>>> + modinfo.emit("alias", alias);
>>> }
>>> }
>>> - if let Some(firmware) = info.firmware {
>>> + if let Some(firmware) = &info.firmware {
>>> for fw in firmware {
>>> - modinfo.emit("firmware", &fw);
>>> + modinfo.emit("firmware", fw);
>>
>> I don't like that you have to change all of these.
>
> Why not? If I was to write this code in the first place, I would have
> used a reference rather than pass by value.
That's fine, but do it in a separate commit then.
>> Can't you just take a
>> `&[Parameter]` argument in `emit_params` instead of the whole
>> `ModuleInfo` struct?
>
> I don't think that is a nice solution. I would have to pass the name
> field as well, increasing the number of parameters to the function.
Ah right makes sense.
---
Cheers,
Benno
next prev parent reply other threads:[~2025-06-12 7:52 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-06 13:02 [PATCH v12 0/3] rust: extend `module!` macro with integer parameter support Andreas Hindborg
2025-05-06 13:02 ` [PATCH v12 1/3] rust: str: add radix prefixed integer parsing functions Andreas Hindborg
2025-05-07 8:58 ` Benno Lossin
2025-05-07 9:15 ` Andreas Hindborg
2025-05-07 11:29 ` Benno Lossin
2025-05-06 13:02 ` [PATCH v12 2/3] rust: add parameter support to the `module!` macro Andreas Hindborg
2025-05-07 11:22 ` Benno Lossin
2025-06-11 10:31 ` Andreas Hindborg
2025-06-11 12:24 ` Andreas Hindborg
2025-06-11 12:36 ` Miguel Ojeda
2025-06-11 13:28 ` Andreas Hindborg
2025-06-12 7:52 ` Benno Lossin [this message]
2025-06-12 11:05 ` Andreas Hindborg
2025-06-11 12:39 ` Miguel Ojeda
2025-05-06 13:02 ` [PATCH v12 3/3] modules: add rust modules files to MAINTAINERS Andreas Hindborg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=DAKE43J2GFVF.18KWPFWPZKDM@kernel.org \
--to=lossin@kernel.org \
--cc=a.hindborg@kernel.org \
--cc=alex.gaynor@gmail.com \
--cc=aliceryhl@google.com \
--cc=ark.email@gmail.com \
--cc=benno.lossin@proton.me \
--cc=bjorn3_gh@protonmail.com \
--cc=boqun.feng@gmail.com \
--cc=da.gomez@samsung.com \
--cc=dakr@kernel.org \
--cc=daniel.almeida@collabora.com \
--cc=gary@garyguo.net \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-modules@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=mcgrof@kernel.org \
--cc=me@kloenk.dev \
--cc=nathan@kernel.org \
--cc=nicolas.schier@linux.dev \
--cc=ojeda@kernel.org \
--cc=petr.pavlu@suse.com \
--cc=rust-for-linux@vger.kernel.org \
--cc=samitolvanen@google.com \
--cc=simona.vetter@ffwll.ch \
--cc=tmgross@umich.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).