From: Tamir Duberstein <tamird@gmail.com>
To: "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>,
"Andreas Hindborg" <a.hindborg@kernel.org>,
"Alice Ryhl" <aliceryhl@google.com>,
"Trevor Gross" <tmgross@umich.edu>,
"Danilo Krummrich" <dakr@kernel.org>,
"Boris-Chengbiao Zhou" <bobo1239@web.de>,
"Kees Cook" <kees@kernel.org>, "Fiona Behrens" <me@kloenk.dev>
Cc: rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org,
Lukas Wirth <lukas.wirth@ferrous-systems.com>,
Tamir Duberstein <tamird@gmail.com>,
Daniel Almeida <daniel.almeida@collabora.com>
Subject: [PATCH v6 13/13] scripts: generate_rust_analyzer.py: use `cfg_groups`
Date: Thu, 24 Apr 2025 06:38:41 -0400 [thread overview]
Message-ID: <20250424-rust-analyzer-host-v6-13-40e67fe5c38a@gmail.com> (raw)
In-Reply-To: <20250424-rust-analyzer-host-v6-0-40e67fe5c38a@gmail.com>
Declare common `cfg`s just once to reduce the size of rust-analyzer.json
from 30619 to 2624 lines.
Link: https://github.com/rust-lang/rust-analyzer/commit/2607c09fddef36da0d6f0a84625db5e20a5ebde3
Reviewed-by: Daniel Almeida <daniel.almeida@collabora.com>
Tested-by: Daniel Almeida <daniel.almeida@collabora.com>
Reviewed-by: Trevor Gross <tmgross@umich.edu>
Signed-off-by: Tamir Duberstein <tamird@gmail.com>
---
scripts/generate_rust_analyzer.py | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/scripts/generate_rust_analyzer.py b/scripts/generate_rust_analyzer.py
index 5f04e3785854..aa79b56ff6f4 100755
--- a/scripts/generate_rust_analyzer.py
+++ b/scripts/generate_rust_analyzer.py
@@ -29,6 +29,7 @@ class Crate(TypedDict):
root_module: str
is_workspace_member: bool
deps: List[Dependency]
+ cfg_groups: List[str]
cfg: List[str]
edition: Literal["2021"]
env: Dict[str, str]
@@ -51,15 +52,8 @@ def generate_crates(
sysroot_src: pathlib.Path,
external_src: pathlib.Path,
crates_cfgs: DefaultDict[str, List[str]],
+ cfg_groups: List[str],
) -> List[Crate]:
- # Generate the configuration list.
- cfg = []
- with open(objtree / "include" / "generated" / "rustc_cfg") as fd:
- for line in fd:
- line = line.replace("--cfg=", "")
- line = line.replace("\n", "")
- cfg.append(line)
-
# Now fill the crates list.
crates: List[Crate] = []
@@ -76,6 +70,9 @@ def generate_crates(
"root_module": str(root_module),
"is_workspace_member": is_workspace_member,
"deps": deps,
+ # `cfg_groups` contain the configs generated by the kernel build system; upstream
+ # (sysroot) crates are not aware of them.
+ "cfg_groups": cfg_groups if is_workspace_member else [],
"cfg": cfg,
"edition": "2021",
"env": {
@@ -298,7 +295,7 @@ def generate_crates(
name,
path,
deps=[core, kernel],
- cfg=cfg,
+ cfg=[],
)
return crates
@@ -338,6 +335,10 @@ def main() -> None:
for crate, _, vals in (cfg.partition("=") for cfg in args.cfgs)
}
+ # Generate the configuration list.
+ with open(args.objtree / "include" / "generated" / "rustc_cfg") as fd:
+ cfg_groups = {"rustc_cfg": [line.lstrip("--cfg=").rstrip("\n") for line in fd]}
+
rust_project = {
"crates": generate_crates(
args.srctree,
@@ -345,8 +346,10 @@ def main() -> None:
args.sysroot_src,
args.exttree,
defaultdict(list, crates_cfg),
+ list(cfg_groups.keys()),
),
"sysroot": str(args.sysroot),
+ "cfg_groups": cfg_groups,
}
json.dump(rust_project, sys.stdout, sort_keys=True, indent=4)
--
2.49.0
prev parent reply other threads:[~2025-04-24 10:38 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-24 10:38 [PATCH v6 00/13] rust: generate_rust_analyzer.py: define host crates and scripts Tamir Duberstein
2025-04-24 10:38 ` [PATCH v6 01/13] scripts: generate_rust_analyzer.py: add missing whitespace Tamir Duberstein
2025-04-24 10:38 ` [PATCH v6 02/13] scripts: generate_rust_analyzer.py: use double quotes Tamir Duberstein
2025-04-24 10:38 ` [PATCH v6 03/13] scripts: generate_rust_analyzer.py: add trailing comma Tamir Duberstein
2025-04-24 10:38 ` [PATCH v6 04/13] scripts: generate_rust_analyzer.py: extract `{build,register}_crate` Tamir Duberstein
2025-04-24 10:38 ` [PATCH v6 05/13] scripts: generate_rust_analyzer.py: drop `"is_proc_macro": false` Tamir Duberstein
2025-04-24 10:38 ` [PATCH v6 06/13] scripts: generate_rust_analyzer.py: add type hints Tamir Duberstein
2025-04-24 10:38 ` [PATCH v6 07/13] scripts: generate_rust_analyzer.py: avoid optional arguments Tamir Duberstein
2025-04-24 10:38 ` [PATCH v6 08/13] scripts: generate_rust_analyzer.py: use str(pathlib.Path) Tamir Duberstein
2025-04-24 10:38 ` [PATCH v6 09/13] scripts: generate_rust_analyzer.py: identify crates explicitly Tamir Duberstein
2025-04-24 10:38 ` [PATCH v6 10/13] scripts: generate_rust_analyzer.py: define host crates Tamir Duberstein
2025-04-24 10:38 ` [PATCH v6 11/13] scripts: generate_rust_analyzer.py: avoid FD leak Tamir Duberstein
2025-04-24 10:38 ` [PATCH v6 12/13] scripts: generate_rust_analyzer.py: define scripts Tamir Duberstein
2025-04-24 10:38 ` Tamir Duberstein [this message]
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=20250424-rust-analyzer-host-v6-13-40e67fe5c38a@gmail.com \
--to=tamird@gmail.com \
--cc=a.hindborg@kernel.org \
--cc=alex.gaynor@gmail.com \
--cc=aliceryhl@google.com \
--cc=benno.lossin@proton.me \
--cc=bjorn3_gh@protonmail.com \
--cc=bobo1239@web.de \
--cc=boqun.feng@gmail.com \
--cc=dakr@kernel.org \
--cc=daniel.almeida@collabora.com \
--cc=gary@garyguo.net \
--cc=kees@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lukas.wirth@ferrous-systems.com \
--cc=me@kloenk.dev \
--cc=ojeda@kernel.org \
--cc=rust-for-linux@vger.kernel.org \
--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
all inboxes | Powered by JetHome®