From nobody Thu Jun 11 15:59:06 2026 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 C697A41324D; Thu, 7 May 2026 14:47:26 +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=1778165246; cv=none; b=rxabhqAWvpn2nMQmEnFw8S7UoM72mGtBkNpnPcZNcjhpqc2k+ZY9M0/QBsIniU8YlKjPK6id9bYaeEjsToVXOfGCqnMtIY9DmPAfTFgQwDjSeMZFlGrlG11yZEy1v6whnR6yluBqYvIzHyc6pMV8WWE3nQy8iBExyuTAHSwKBPA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778165246; c=relaxed/simple; bh=e42PGqJIoMSBUoUsIGwfEADcvHMHKxi2nIW9YaUrGko=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=d8BuaUYDXBQG1MEpAhGuHSQPZ/hxIUYDmZbNN0vGca5g0clacXboldogzXbVxe65L6/tPL3DUMvsTu9g+fhk4oJkZ6KJVczoQ8gG1X7X6xmHCxrO9kmqbGWakXDqMjgZ52aZXTFzB843Yp149T3FzoMQWM+8/8AgHHjUDWyAO4Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=nX5vygH1; 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="nX5vygH1" Received: by smtp.kernel.org (Postfix) with ESMTPS id 50A2FC2BCB2; Thu, 7 May 2026 14:47:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778165246; bh=e42PGqJIoMSBUoUsIGwfEADcvHMHKxi2nIW9YaUrGko=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=nX5vygH1g+0e+ZFHfEJ8wdglg0J7BNF3mdgIMbpxrhcMeDCeB6FFqCC7V2ICB5ZI/ zU2ZAnYOH9PEiGpRkPJs4DY2sCBpxK/2cC0yIAnqqoRNn5A8WlJ3shbO72WdXQUVKO DI5p/whAEd9t2DJ77i9NFkcm/D6jDr+Zn7QfnR4jszyJX3YQB4tunwaZ1U4EtrCVNk J9ICqzrmflhxUFTzT1tNqUyWI6A18MUiN5+WjgmEKicXoC3yuzesY7a5/rPqDSHquj a2OW/kzzEiBmnqqhKWyIwrUtQ6/VXhpmk3JI0Vkke/8Cq7Y0HmwdTRa5yviEM22s1e msXHeTsoE5qVQ== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 43B27CD3439; Thu, 7 May 2026 14:47:26 +0000 (UTC) From: Jesung Yang via B4 Relay Date: Thu, 07 May 2026 23:47:24 +0900 Subject: [PATCH v7 1/2] scripts: generate_rust_analyzer.py: add versioning infrastructure Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260507-ra-fix-primitive-v7-1-cb8e3791f2b5@gmail.com> References: <20260507-ra-fix-primitive-v7-0-cb8e3791f2b5@gmail.com> In-Reply-To: <20260507-ra-fix-primitive-v7-0-cb8e3791f2b5@gmail.com> To: Miguel Ojeda , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Tamir Duberstein Cc: Eliot Courtney , rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, Jesung Yang X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1778165245; l=7840; i=y.j3ms.n@gmail.com; s=kernel; h=from:subject:message-id; bh=Fk26LhKvs70DZF/JFGyTu3u88rmwLml0G7as6n/EE6I=; b=KnmBnqRzjHWMh2CquJWsvdIvEhB7oHFeOzK7z90a7Y3XLehqnFfWoTrV8wweoN/yDO3szkvSC gCe1SFpjEmwCuQPQft5uwYZYaaP4FFgz6aIPH+AHQiDeE1ZG9dGiCtA X-Developer-Key: i=y.j3ms.n@gmail.com; a=ed25519; pk=4nSlncQuTIIYLyLXkNxS0ssInM3uK0snxLSeQ2tdG/o= X-Endpoint-Received: by B4 Relay for y.j3ms.n@gmail.com/kernel with auth_id=755 X-Original-From: Jesung Yang Reply-To: y.j3ms.n@gmail.com From: Jesung Yang Introduce multi-version support for rust-analyzer. The script now executes `rust-analyzer --version` to query the version string. This is a preparatory patch to address inherent method resolution failures for primitive types occurring in rust-analyzer v0.3.2693 (2025-11-24) or later when used with our current `rust-project.json` generation logic. Since the actual fix requires using the `sysroot_src` field with a feature only available in rust-analyzer v0.3.2727 (2025-12-22) or later, this infrastructure is necessary to maintain compatibility with older rust-analyzer releases. Signed-off-by: Jesung Yang Reviewed-by: Tamir Duberstein --- scripts/generate_rust_analyzer.py | 186 ++++++++++++++++++++++++++++++++++= +++- 1 file changed, 182 insertions(+), 4 deletions(-) diff --git a/scripts/generate_rust_analyzer.py b/scripts/generate_rust_anal= yzer.py index d5f9a0ca742c..79c69004aed1 100755 --- a/scripts/generate_rust_analyzer.py +++ b/scripts/generate_rust_analyzer.py @@ -4,6 +4,9 @@ """ =20 import argparse +from datetime import date +import enum +import re import json import logging import os @@ -343,6 +346,161 @@ def generate_crates( =20 return crates =20 + +Version =3D tuple[int, int, int] + + +@enum.unique +class RaVersionInfo(enum.Enum): + """ + Represents rust-analyzer compatibility baselines. Concrete versions are + mapped to the most recent baseline they have reached. Must be in relea= se + order. + """ + + # NOTE: + # This rust-analyzer release should be kept in sync with our MSRV (cur= rently + # 1.85.0). When the MSRV is bumped, follow the steps below to retrieve= the + # information needed to update this: + # + # 1) Clone both Rust and rust-analyzer repositories. + # ```console + # $ git clone https://github.com/rust-lang/rust.git + # $ git clone https://github.com/rust-lang/rust-analyzer.git + # ``` + # 2) Run the following script, providing the new MSRV as an argument= . It + # prints a link to the matching [1] rust-analyzer release page. + # ```bash + # #!/usr/bin/env bash + # + # set -euo pipefail + # + # RUST_VERSION=3D$1 + # + # grep_args=3D() + # while IFS=3D read -r subject; do + # grep_args+=3D(--grep "$subject") + # done < <(git -C rust log \ + # --fixed-strings \ + # --format=3D'%s' \ + # --grep 'Merge pull request #' \ + # --merges \ + # --no-follow \ + # -n 10 \ + # "$RUST_VERSION" \ + # -- src/tools/rust-analyzer + # ) + # + # tag_predates=3D$( + # git -C rust-analyzer log \ + # --fixed-strings \ + # --format=3D'%(describe:tags,abbrev=3D0)' \ + # --merges \ + # -n 1 \ + # "${grep_args[@]}" + # ) + # + # link_prefix=3D"https://github.com/rust-lang/rust-analyzer/relea= ses/tag" + # echo "$link_prefix/$tag_predates" + # ``` + # 3) Grab the release date and the version string. + # + # [1] Note that rust-analyzer releases may not perfectly align with th= ose + # shipped in upstream Rust. We take a conservative approach here: = use + # the tag that directly predates the latest merge commit found ups= tream. + # + # v0.3.2228, released on 2024-12-23; + # shipped with the rustup 1.85.0 toolchain. + MSRV =3D ( + date(2024, 12, 23), + (0, 3, 2228), + (1, 85, 0), + ) + + def __init__( + self, + release_date: date, + ra_version: Version, + rust_version: Version, + ) -> None: + self.release_date =3D release_date + self.ra_version =3D ra_version + self.rust_version =3D rust_version + + +class RustProject(TypedDict): + crates: List[Crate] + sysroot: str + + +def generate_rust_project( + _version_info: RaVersionInfo, + srctree: pathlib.Path, + objtree: pathlib.Path, + sysroot: pathlib.Path, + sysroot_src: pathlib.Path, + external_src: Optional[pathlib.Path], + cfgs: List[str], + core_edition: str, +) -> RustProject: + rust_project: RustProject =3D { + "crates": generate_crates( + srctree, objtree, sysroot_src, external_src, cfgs, core_edition + ), + "sysroot": str(sysroot), + } + + return rust_project + +def query_ra_version() -> Optional[str]: + try: + # Use the rust-analyzer binary found in $PATH. + ra_version_output =3D ( + subprocess.check_output( + ["rust-analyzer", "--version"], + stdin=3Dsubprocess.DEVNULL, + ) + .decode("utf-8") + .strip() + ) + return ra_version_output + except FileNotFoundError: + return None + +def map_ra_version_baseline(ra_version_output: str) -> RaVersionInfo: + baselines =3D list(reversed(RaVersionInfo)) + + version_match =3D re.search(r"\d+\.\d+\.\d+", ra_version_output) + if version_match: + version_string =3D version_match.group() + found_version =3D tuple(map(int, version_string.split("."))) + + # `rust-analyzer --version` shows a different version string depen= ding + # on how the binary is built: it may print either the Rust version= or + # the rust-analyzer version itself. To distinguish between them, we + # leverage rust-analyzer's versioning convention. + # + # See: + # - https://github.com/rust-lang/rust-analyzer/blob/fad5c3d2d642/x= task/src/dist.rs#L19-L21 + is_ra_version =3D version_string.startswith(("0.3", "0.4", "0.5")) + if is_ra_version: + for info in baselines: + if found_version >=3D info.ra_version: + return info + else: + for info in baselines: + if found_version >=3D info.rust_version: + return info + + date_match =3D re.search(r"\d{4}-\d{2}-\d{2}", ra_version_output) + if date_match: + found_date =3D date.fromisoformat(date_match.group()) + for info in baselines: + if found_date >=3D info.release_date: + return info + + return RaVersionInfo.MSRV + def main() -> None: parser =3D argparse.ArgumentParser() parser.add_argument('--verbose', '-v', action=3D'store_true') @@ -371,10 +529,30 @@ def main() -> None: level=3Dlogging.INFO if args.verbose else logging.WARNING ) =20 - rust_project =3D { - "crates": generate_crates(args.srctree, args.objtree, args.sysroot= _src, args.exttree, args.cfgs, args.core_edition), - "sysroot": str(args.sysroot), - } + ra_version_output =3D query_ra_version() + if ra_version_output: + compatible_ra_version =3D map_ra_version_baseline(ra_version_outpu= t) + else: + logging.warning( + "Failed to find rust-analyzer in $PATH; " \ + "falling back to `rust-project.json` for rust-analyzer " \ + "%s, %s (shipped with Rust %s)", + ".".join(map(str, RaVersionInfo.MSRV.ra_version)), + RaVersionInfo.MSRV.release_date, + ".".join(map(str, RaVersionInfo.MSRV.rust_version)), + ) + compatible_ra_version =3D RaVersionInfo.MSRV + + rust_project =3D generate_rust_project( + compatible_ra_version, + args.srctree, + args.objtree, + args.sysroot, + args.sysroot_src, + args.exttree, + args.cfgs, + args.core_edition, + ) =20 json.dump(rust_project, sys.stdout, sort_keys=3DTrue, indent=3D4) =20 --=20 2.53.0 From nobody Thu Jun 11 15:59:06 2026 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 C741941C2FA; Thu, 7 May 2026 14:47:26 +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=1778165246; cv=none; b=YTZJsKTaYzD/0iv3TSBI1Q/wFO0THq5rYHADVI08YumsFwQqX0kRCarrvK68BH0crri5CNtCWq2Jv3NX142ykdS/17GrndhKaDk0w1LmTJaz5ldxlFol6jNnW7fyCBULqlBGvDtcpThHVylBfFgIgdJoFWp32PRVL0rpkif5XFk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778165246; c=relaxed/simple; bh=KS8a24J1gPhK5w6JvTD6jz/Y9q4tuGgsdsS/4VFiK+8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=I9HnUat9pF1tur3H7p6kALsSiUr5dmyVB1d1XwXbr9l5J55phFROLBnKYN3Iz+jQcRSzXEwpfQD4S+SZEhAx8XNvY1uLk5JdPgMKmUZWH/jZZAnA4GJIiSh97ypK69x+yk7tXl5+a20KV9j6KNIyjXJEqK98SCEgC5Guvx1LJNA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=nnyyBY/w; 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="nnyyBY/w" Received: by smtp.kernel.org (Postfix) with ESMTPS id 72A7CC2BCC4; Thu, 7 May 2026 14:47:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778165246; bh=KS8a24J1gPhK5w6JvTD6jz/Y9q4tuGgsdsS/4VFiK+8=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=nnyyBY/wJkU9jcrUb70je8ViovOOmomjCJv0h1rlaJVpb7U0mX9DpaSnrzDt84VFU aA4WYZkaJnvxGSj7KHsO1gnSzas54Kx+f96s5h34jzyM7vlIPJQNO13Hx/D0bob0YZ b2CDw4DwTEst+KbYM8pVwfR1zEBdhd0PlDfOlTfS2plG3SGvj/0PbC63e+ROkl23Eh +M3L3OuwSHrdbHkh+ktmWYtL52uZUXLnEJK5VWVlWfS5fCRMJqtNW9hrDCOA9GiHcH tCwZqnro8Kups+bIDu+LFfyATGxgMQgZD8Pe29e6xwnufAIP/zwH0Z3Yv6HcI58AzL I567mBdTXldzQ== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 56C61CD3442; Thu, 7 May 2026 14:47:26 +0000 (UTC) From: Jesung Yang via B4 Relay Date: Thu, 07 May 2026 23:47:25 +0900 Subject: [PATCH v7 2/2] scripts: generate_rust_analyzer.py: fix IDE support for primitive types Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260507-ra-fix-primitive-v7-2-cb8e3791f2b5@gmail.com> References: <20260507-ra-fix-primitive-v7-0-cb8e3791f2b5@gmail.com> In-Reply-To: <20260507-ra-fix-primitive-v7-0-cb8e3791f2b5@gmail.com> To: Miguel Ojeda , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Tamir Duberstein Cc: Eliot Courtney , rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, Jesung Yang X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1778165245; l=9490; i=y.j3ms.n@gmail.com; s=kernel; h=from:subject:message-id; bh=EfvWMSOdPqKPOjfHTHCBWBx35ul3PX2qpFJE57W+2l0=; b=VTw/KhSIaNqnEzg6Wy1ZdcDDA6jjbv9bmmDXe0XPLkHybd0hL74urX6tOhk4TVs3MaaU26mkw eavdgE58S9tDzO2CizoUTiP0yLiPBLwMxVlQvf0/mp6NEiKOUZ2Jmo5 X-Developer-Key: i=y.j3ms.n@gmail.com; a=ed25519; pk=4nSlncQuTIIYLyLXkNxS0ssInM3uK0snxLSeQ2tdG/o= X-Endpoint-Received: by B4 Relay for y.j3ms.n@gmail.com/kernel with auth_id=755 X-Original-From: Jesung Yang Reply-To: y.j3ms.n@gmail.com From: Jesung Yang Update `generate_rust_analyzer.py` so that the generated `rust-project.json` contains the `sysroot_src` field with `"crate_attrs": ["no_std"]` specified for relevant crates. This ensures that rust-analyzer provides proper IDE support for inherent methods of primitive types. Since commit 50384460c68f ("Rewrite method resolution to follow rustc more closely") to rust-analyzer, it no longer provides language server features like code completion and go-to-definition for inherent methods of primitive types when sysroot crates (e.g., `core`, `std`) are inlined in `rust-project.json` [1]. As `generate_rust_analyzer.py` currently inlines these crates, our setup is affected by this change. Specifying the `sysroot_src` field restores this functionality by allowing rust-analyzer to locate sysroot crates by itself. However, this causes `std` to be treated as a dependency for all local crates by default. To align with our compilation settings, provide the `no_std` attribute via the `crate_attrs` field, as the `-Zcrate-attr=3Dno_std` compiler flag is not visible to rust-analyzer. This combined approach removes manual manipulation of sysroot dependencies while preventing incorrect symbol resolution against the standard library. Note that this configuration requires rust-analyzer release 2025-12-22 (v0.3.2727) or later, which introduced support for the `crate_attrs` field. Link: https://rust-lang.zulipchat.com/#narrow/channel/x/topic/x/near/561607= 963 [1] Link: https://rust-for-linux.zulipchat.com/#narrow/channel/x/topic/x/near/5= 61607753 Reviewed-by: Tamir Duberstein Signed-off-by: Jesung Yang --- scripts/generate_rust_analyzer.py | 108 ++++++++++++++++++++++++++++++----= ---- 1 file changed, 87 insertions(+), 21 deletions(-) diff --git a/scripts/generate_rust_analyzer.py b/scripts/generate_rust_anal= yzer.py index 79c69004aed1..8629dd186891 100755 --- a/scripts/generate_rust_analyzer.py +++ b/scripts/generate_rust_analyzer.py @@ -4,6 +4,7 @@ """ =20 import argparse +from dataclasses import dataclass from datetime import date import enum import re @@ -39,14 +40,28 @@ class Source(TypedDict): exclude_dirs: List[str] =20 =20 -class Crate(TypedDict): - display_name: str - root_module: str - is_workspace_member: bool - deps: List[Dependency] - cfg: List[str] - edition: str - env: Dict[str, str] +# TODO: clean up once Python 3.11 is adopted. +if sys.version_info < (3, 11): + class Crate(TypedDict, total=3DFalse): + display_name: str + root_module: str + is_workspace_member: bool + deps: List[Dependency] + cfg: List[str] + crate_attrs: List[str] + edition: str + env: Dict[str, str] +else: + from typing import NotRequired + class Crate(TypedDict): + display_name: str + root_module: str + is_workspace_member: bool + deps: List[Dependency] + cfg: List[str] + crate_attrs: NotRequired[List[str]] + edition: str + env: Dict[str, str] =20 =20 class ProcMacroCrate(Crate): @@ -58,7 +73,14 @@ class CrateWithGenerated(Crate): source: Source =20 =20 +@dataclass(frozen=3DTrue) +class RaVersionCtx: + manual_sysroot_crates: bool + use_crate_attrs: bool + + def generate_crates( + ctx: RaVersionCtx, srctree: pathlib.Path, objtree: pathlib.Path, sysroot_src: pathlib.Path, @@ -84,22 +106,24 @@ def generate_crates( def build_crate( display_name: str, root_module: pathlib.Path, - deps: List[Dependency], + deps: List[Optional[Dependency]], *, cfg: Optional[List[str]], + crate_attrs: Optional[List[str]], is_workspace_member: Optional[bool], edition: Optional[str], ) -> Crate: + filtered_deps =3D [dep for dep in deps if dep is not None] cfg =3D cfg if cfg is not None else crates_cfgs.get(display_name, = []) is_workspace_member =3D ( is_workspace_member if is_workspace_member is not None else Tr= ue ) edition =3D edition if edition is not None else "2021" - return { + crate: Crate =3D { "display_name": display_name, "root_module": str(root_module), "is_workspace_member": is_workspace_member, - "deps": deps, + "deps": filtered_deps, "cfg": cfg, "edition": edition, "env": { @@ -107,10 +131,15 @@ def generate_crates( } } =20 + if ctx.use_crate_attrs and crate_attrs is not None: + crate["crate_attrs"] =3D crate_attrs + + return crate + def append_proc_macro_crate( display_name: str, root_module: pathlib.Path, - deps: List[Dependency], + deps: List[Optional[Dependency]], *, cfg: Optional[List[str]] =3D None, is_workspace_member: Optional[bool] =3D None, @@ -121,6 +150,7 @@ def generate_crates( root_module, deps, cfg=3Dcfg, + crate_attrs=3DNone, is_workspace_member=3Dis_workspace_member, edition=3Dedition, ) @@ -148,9 +178,10 @@ def generate_crates( def append_crate( display_name: str, root_module: pathlib.Path, - deps: List[Dependency], + deps: List[Optional[Dependency]], *, cfg: Optional[List[str]] =3D None, + crate_attrs: Optional[List[str]] =3D None, is_workspace_member: Optional[bool] =3D None, edition: Optional[str] =3D None, ) -> Dependency: @@ -160,6 +191,7 @@ def generate_crates( root_module, deps, cfg=3Dcfg, + crate_attrs=3Dcrate_attrs, is_workspace_member=3Dis_workspace_member, edition=3Dedition, ) @@ -167,10 +199,12 @@ def generate_crates( =20 def append_sysroot_crate( display_name: str, - deps: List[Dependency], + deps: List[Optional[Dependency]], *, cfg: Optional[List[str]] =3D None, - ) -> Dependency: + ) -> Optional[Dependency]: + if not ctx.manual_sysroot_crates: + return None return append_crate( display_name, sysroot_src / display_name / "src" / "lib.rs", @@ -269,13 +303,14 @@ def generate_crates( =20 def append_crate_with_generated( display_name: str, - deps: List[Dependency], + deps: List[Optional[Dependency]], ) -> Dependency: crate =3D build_crate( display_name, srctree / "rust"/ display_name / "lib.rs", deps, cfg=3Dgenerated_cfg, + crate_attrs=3DNone, is_workspace_member=3DTrue, edition=3DNone, ) @@ -342,6 +377,7 @@ def generate_crates( path, [core, kernel, pin_init], cfg=3Dgenerated_cfg, + crate_attrs=3D["no_std"], ) =20 return crates @@ -415,6 +451,21 @@ class RaVersionInfo(enum.Enum): date(2024, 12, 23), (0, 3, 2228), (1, 85, 0), + RaVersionCtx( + use_crate_attrs=3DFalse, + manual_sysroot_crates=3DTrue, + ), + ) + # v0.3.2727, released on 2025-12-22; + # v0.3.2743 is shipped with the rustup 1.94.0 toolchain. + SUPPROTS_CRATE_ATTRS =3D ( + date(2025, 12, 22), + (0, 3, 2727), + (1, 94, 0), + RaVersionCtx( + use_crate_attrs=3DTrue, + manual_sysroot_crates=3DFalse, + ), ) =20 def __init__( @@ -422,19 +473,30 @@ class RaVersionInfo(enum.Enum): release_date: date, ra_version: Version, rust_version: Version, + ctx: RaVersionCtx, ) -> None: self.release_date =3D release_date self.ra_version =3D ra_version self.rust_version =3D rust_version + self.ctx =3D ctx =20 =20 -class RustProject(TypedDict): - crates: List[Crate] - sysroot: str +# TODO: clean up once Python 3.11 is adopted. +if sys.version_info < (3, 11): + class RustProject(TypedDict, total=3DFalse): + crates: List[Crate] + sysroot: str + sysroot_src: str +else: + from typing import NotRequired + class RustProject(TypedDict): + crates: List[Crate] + sysroot: str + sysroot_src: NotRequired[str] =20 =20 def generate_rust_project( - _version_info: RaVersionInfo, + version_info: RaVersionInfo, srctree: pathlib.Path, objtree: pathlib.Path, sysroot: pathlib.Path, @@ -443,13 +505,17 @@ def generate_rust_project( cfgs: List[str], core_edition: str, ) -> RustProject: + ctx =3D version_info.ctx rust_project: RustProject =3D { "crates": generate_crates( - srctree, objtree, sysroot_src, external_src, cfgs, core_edition + ctx, srctree, objtree, sysroot_src, external_src, cfgs, core_e= dition ), "sysroot": str(sysroot), } =20 + if not ctx.manual_sysroot_crates: + rust_project["sysroot_src"] =3D str(sysroot_src) + return rust_project =20 def query_ra_version() -> Optional[str]: --=20 2.53.0