rust: kbuild: give `--config-path` to `rustfmt` in `.rsi` target
Subsystems (3)
Miguel Ojeda
maintainerPATCH 1/1 rust: kbuild: give `--config-path` to `rustfmt` in `.rsi` target
rustfmt is configured via the .rustfmt.toml file in the source tree, and we apply rustfmt to the macro expanded sources generated by the .rsi target.
However, under an O= pointing to an external folder (i.e. not just a subdir), rustfmt will not find the file when checking the parent folders. Since the edition is configured in this file, this can lead to errors when it encounters newer syntax, e.g.
error: expected one of `!`, `.`, `::`, `;`, `?`, `where`, `{`, or an operator, found `"rust_minimal"`
--> samples/rust/rust_minimal.rsi:29:49
|
28 | impl ::kernel::ModuleMetadata for RustMinimal {
| - while parsing this item list starting here
29 | const NAME: &'static ::kernel::str::CStr = c"rust_minimal";
| ^^^^^^^^^^^^^^ expected one of 8 possible tokens
30 | }
| - the item list ends here
|
= note: you may be trying to write a c-string literal
= note: c-string literals require Rust 2021 or later
= help: pass `--edition 2024` to `rustc`
= note: for more on editions, read https://doc.rust-lang.org/edition-guideA workaround is to use RUSTFMT=n, which is documented in the Makefile help for cases where macro expanded source may happen to break rustfmt for other reasons, but this is not one of those cases.
One solution would be to pass --edition, but we want rustfmt to use the entire configuration, even if currently we essentially use the default configuration.
Thus explicitly give the path to the config file to rustfmt instead.
--- scripts/Makefile.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/Makefile.build +1 -1
@@ -356,7 +356,7 @@ $(obj)/%.o: $(obj)/%.rs FORCE quiet_cmd_rustc_rsi_rs = $(RUSTC_OR_CLIPPY_QUIET) $(quiet_modtag) $@ cmd_rustc_rsi_rs = \ $(rust_common_cmd) -Zunpretty=expanded $< >$@; \ - command -v $(RUSTFMT) >/dev/null && $(RUSTFMT) $@ + command -v $(RUSTFMT) >/dev/null && $(RUSTFMT) --config-path $(srctree)/.rustfmt.toml $@ $(obj)/%.rsi: $(obj)/%.rs FORCE +$(call if_changed_dep,rustc_rsi_rs)
base-commit: 74e15ac34b098934895fd27655d098971d2b43d9
Signature · 1 line
2.52.0
Quoted 32 lines · Miguel Ojeda
rustfmtis configured via the.rustfmt.tomlfile in the source tree, and we applyrustfmtto the macro expanded sources generated by the.rsitarget.However, under an
O=pointing to an external folder (i.e. not just a subdir),rustfmtwill not find the file when checking the parent folders. Since the edition is configured in this file, this can lead to errors when it encounters newer syntax, e.g.error: expected one of `!`, `.`, `::`, `;`, `?`, `where`, `{`, or an operator, found `"rust_minimal"` --> samples/rust/rust_minimal.rsi:29:49 | 28 | impl ::kernel::ModuleMetadata for RustMinimal { | - while parsing this item list starting here 29 | const NAME: &'static ::kernel::str::CStr = c"rust_minimal"; | ^^^^^^^^^^^^^^ expected one of 8 possible tokens 30 | } | - the item list ends here | = note: you may be trying to write a c-string literal = note: c-string literals require Rust 2021 or later = help: pass `--edition 2024` to `rustc` = note: for more on editions, read https://doc.rust-lang.org/edition-guideA workaround is to use
RUSTFMT=n, which is documented in theMakefilehelp for cases where macro expanded source may happen to breakrustfmtfor other reasons, but this is not one of those cases.One solution would be to pass
--edition, but we wantrustfmtto use the entire configuration, even if currently we essentially use the default configuration.
Quoted 6 lines
Thus explicitly give the path to the config file to
rustfmtinstead.Reported-by Alice Ryhl <[email protected]>Fixes 2f7ab1267dc9 ("Kbuild: add Rust support")Signed-off-by Miguel Ojeda <[email protected]>
I assume you will take this via the Rust tree?
Quoted 22 lines
--- scripts/Makefile.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)scripts/Makefile.build +1
-1@@ -356,7 +356,7 @@ $(obj)/%.o: $(obj)/%.rs FORCE quiet_cmd_rustc_rsi_rs = $(RUSTC_OR_CLIPPY_QUIET) $(quiet_modtag) $@ cmd_rustc_rsi_rs = \ $(rust_common_cmd) -Zunpretty=expanded $< >$@; \ - command -v $(RUSTFMT) >/dev/null && $(RUSTFMT) $@ + command -v $(RUSTFMT) >/dev/null && $(RUSTFMT) --config-path $(srctree)/.rustfmt.toml $@ $(obj)/%.rsi: $(obj)/%.rs FORCE +$(call if_changed_dep,rustc_rsi_rs)base-commit:
74e15ac34b098934895fd27655d098971d2b43d9Signature · 1 line
2.52.0
Quoted 4 lines · Nathan Chancellor
Reviewed-by Nathan Chancellor <[email protected]>I assume you will take this via the Rust tree?
Yeah, either way is fine, but I can put it in rust-fixes since I will send a PR in a few days.
Thanks!
Cheers,
Miguel
Quoted 32 lines · Miguel Ojeda
rustfmtis configured via the.rustfmt.tomlfile in the source tree, and we applyrustfmtto the macro expanded sources generated by the.rsitarget.However, under an
O=pointing to an external folder (i.e. not just a subdir),rustfmtwill not find the file when checking the parent folders. Since the edition is configured in this file, this can lead to errors when it encounters newer syntax, e.g.error: expected one of `!`, `.`, `::`, `;`, `?`, `where`, `{`, or an operator, found `"rust_minimal"` --> samples/rust/rust_minimal.rsi:29:49 | 28 | impl ::kernel::ModuleMetadata for RustMinimal { | - while parsing this item list starting here 29 | const NAME: &'static ::kernel::str::CStr = c"rust_minimal"; | ^^^^^^^^^^^^^^ expected one of 8 possible tokens 30 | } | - the item list ends here | = note: you may be trying to write a c-string literal = note: c-string literals require Rust 2021 or later = help: pass `--edition 2024` to `rustc` = note: for more on editions, read https://doc.rust-lang.org/edition-guideA workaround is to use
RUSTFMT=n, which is documented in theMakefilehelp for cases where macro expanded source may happen to breakrustfmtfor other reasons, but this is not one of those cases.One solution would be to pass
--edition, but we wantrustfmtto use the entire configuration, even if currently we essentially use the default configuration.
Quoted 6 lines
Thus explicitly give the path to the config file to
rustfmtinstead.Reported-by Alice Ryhl <[email protected]>Fixes 2f7ab1267dc9 ("Kbuild: add Rust support")Signed-off-by Miguel Ojeda <[email protected]>
Quoted 3 lines
--- scripts/Makefile.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Miguel Ojeda
AppliedQuoted 33 lines · Miguel Ojeda
rustfmtis configured via the.rustfmt.tomlfile in the source tree, and we applyrustfmtto the macro expanded sources generated by the.rsitarget.However, under an
O=pointing to an external folder (i.e. not just a subdir),rustfmtwill not find the file when checking the parent folders. Since the edition is configured in this file, this can lead to errors when it encounters newer syntax, e.g.error: expected one of `!`, `.`, `::`, `;`, `?`, `where`, `{`, or an operator, found `"rust_minimal"` --> samples/rust/rust_minimal.rsi:29:49 | 28 | impl ::kernel::ModuleMetadata for RustMinimal { | - while parsing this item list starting here 29 | const NAME: &'static ::kernel::str::CStr = c"rust_minimal"; | ^^^^^^^^^^^^^^ expected one of 8 possible tokens 30 | } | - the item list ends here | = note: you may be trying to write a c-string literal = note: c-string literals require Rust 2021 or later = help: pass `--edition 2024` to `rustc` = note: for more on editions, read https://doc.rust-lang.org/edition-guideA workaround is to use
RUSTFMT=n, which is documented in theMakefilehelp for cases where macro expanded source may happen to breakrustfmtfor other reasons, but this is not one of those cases.One solution would be to pass
--edition, but we wantrustfmtto use the entire configuration, even if currently we essentially use the default configuration.
Quoted 6 lines
Thus explicitly give the path to the config file to
rustfmtinstead.Reported-by Alice Ryhl <[email protected]>Fixes 2f7ab1267dc9 ("Kbuild: add Rust support")Signed-off-by Miguel Ojeda <[email protected]>
Applied to rust-fixes -- thanks everyone!
Cheers,
Miguel
Alice Ryhl
reviewerQuoted 35 lines · Miguel Ojeda
Quoted 33 lines · Miguel Ojeda
rustfmtis configured via the.rustfmt.tomlfile in the source tree, and we applyrustfmtto the macro expanded sources generated by the.rsitarget.However, under an
O=pointing to an external folder (i.e. not just a subdir),rustfmtwill not find the file when checking the parent folders. Since the edition is configured in this file, this can lead to errors when it encounters newer syntax, e.g.error: expected one of `!`, `.`, `::`, `;`, `?`, `where`, `{`, or an operator, found `"rust_minimal"` --> samples/rust/rust_minimal.rsi:29:49 | 28 | impl ::kernel::ModuleMetadata for RustMinimal { | - while parsing this item list starting here 29 | const NAME: &'static ::kernel::str::CStr = c"rust_minimal"; | ^^^^^^^^^^^^^^ expected one of 8 possible tokens 30 | } | - the item list ends here | = note: you may be trying to write a c-string literal = note: c-string literals require Rust 2021 or later = help: pass `--edition 2024` to `rustc` = note: for more on editions, read https://doc.rust-lang.org/edition-guideA workaround is to use
RUSTFMT=n, which is documented in theMakefilehelp for cases where macro expanded source may happen to breakrustfmtfor other reasons, but this is not one of those cases.One solution would be to pass
--edition, but we wantrustfmtto use the entire configuration, even if currently we essentially use the default configuration.
Quoted 8 lines
Quoted 6 lines
Thus explicitly give the path to the config file to
rustfmtinstead.Reported-by Alice Ryhl <[email protected]>Fixes 2f7ab1267dc9 ("Kbuild: add Rust support")Signed-off-by Miguel Ojeda <[email protected]>Applied to
rust-fixes-- thanks everyone!
Thanks Miguel for looking into this.
Alice