From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2BCA13BFE25; Thu, 15 Jan 2026 18:38:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768502333; cv=none; b=E6j1fWEnC9OCIDjW8fYMJ1XtrWig2G2Aw53IXqRIUldDEg8NTle/k6chiX2ds3QnNlbVUSnOjPE7rHAUDW4Yd4BnVXc62cVZHrFjtXR+ybiciTNv98oQOgK6g5d6+PmoLe+xvs0LK40VA1Io/AcxSrKczNPjzjBfsA8Ex2qJYYM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768502333; c=relaxed/simple; bh=7S5r6qZkhx5y+DfF1z743TKT2hep7ZzGxgnEnl90z94=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=QR3V3nAVCVqvi3zq1qJq8GsOdrjbWnksp6U+Hw+aTeiCILNeJHJZRp14lJG0hphMkXuQPsboVwEryLLqpO2qWIfXCIXoU9a8ovdwNkI8I1a3ELrgmPSRcgRq5soyRCtHiLS36SHRCqChLkoF1YUlfxgalwsvaVPGT7v8ZdPSoBU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=b0WQ54ov; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="b0WQ54ov" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CB36EC116D0; Thu, 15 Jan 2026 18:38:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1768502332; bh=7S5r6qZkhx5y+DfF1z743TKT2hep7ZzGxgnEnl90z94=; h=From:To:Cc:Subject:Date:From; b=b0WQ54ovxPyCPGmMpcCdfFqqfNd+sA6WAcvucBqhXOhMlMdmNEwMUkeN39D08cdJi pPOvb573LNFZSZE+nNiYnWR0LWxG9qTWhrowtJKv6EBYB6VQxZVNiS3cSSsMgXw1bi ml9zjCfB0gDYHHrqctSFvlVlBCpMfQL+FJO26JN4oeVGXCmcLRNDiU133FetV0UTrC 7EWdrWv7yJmXd6fisXCKJRTyrmBnhTRJ6brbQlSAOC/U/WQYU2u07V8WaXYfeEK1fV cLqOY4kQnuarBofizJ+l/b4bJz3yIswIUt7I3LbqVfJTZB+cxy2fjuDB3L4KKBdYib oYTSJ7M4DoLug== From: Miguel Ojeda To: Miguel Ojeda , Nathan Chancellor , Nicolas Schier Cc: Boqun Feng , Gary Guo , =?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , rust-for-linux@vger.kernel.org, linux-kbuild@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH] rust: kbuild: give `--config-path` to `rustfmt` in `.rsi` target Date: Thu, 15 Jan 2026 19:38:32 +0100 Message-ID: <20260115183832.46595-1-ojeda@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit `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-guide A 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. Reported-by: Alice Ryhl Fixes: 2f7ab1267dc9 ("Kbuild: add Rust support") Cc: stable@vger.kernel.org Signed-off-by: Miguel Ojeda --- scripts/Makefile.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 5037f4715d74..0c838c467c76 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -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 -- 2.52.0