mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
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>
Subject: [PATCH v4 11/11] scripts: generate_rust_analyzer.py: use `cfg_groups`
Date: Sat, 22 Mar 2025 09:23:46 -0400	[thread overview]
Message-ID: <20250322-rust-analyzer-host-v4-11-1f51f9c907eb@gmail.com> (raw)
In-Reply-To: <20250322-rust-analyzer-host-v4-0-1f51f9c907eb@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
Signed-off-by: Tamir Duberstein <tamird@gmail.com>
---
 scripts/generate_rust_analyzer.py | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/scripts/generate_rust_analyzer.py b/scripts/generate_rust_analyzer.py
index 957b413fe0b6..3d89c0198db4 100755
--- a/scripts/generate_rust_analyzer.py
+++ b/scripts/generate_rust_analyzer.py
@@ -37,6 +37,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]
@@ -59,15 +60,8 @@ def generate_crates(
     sysroot_src: pathlib.Path,
     external_src: pathlib.Path,
     cfgs: 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] = []
     crates_cfgs = args_crates_cfgs(cfgs)
@@ -77,6 +71,7 @@ def generate_crates(
         root_module: pathlib.Path,
         deps: List[Dependency],
         cfg: List[str] = [],
+        cfg_groups: List[str] = [],
         is_workspace_member: bool = True,
     ) -> Crate:
         return {
@@ -85,6 +80,7 @@ def generate_crates(
             "is_workspace_member": is_workspace_member,
             "deps": deps,
             "cfg": cfg,
+            "cfg_groups": cfg_groups,
             "edition": "2021",
             "env": {
                 "RUST_MODFILE": "This is only for rust-analyzer"
@@ -101,10 +97,13 @@ def generate_crates(
         root_module: pathlib.Path,
         deps: List[Dependency],
         cfg: List[str] = [],
+        cfg_groups: List[str] = [],
         is_workspace_member: bool = True,
     ) -> Dependency:
         return register_crate(
-            build_crate(display_name, root_module, deps, cfg, is_workspace_member)
+            build_crate(
+                display_name, root_module, deps, cfg, cfg_groups, is_workspace_member
+            )
         )
 
     def append_proc_macro_crate(
@@ -190,7 +189,7 @@ def generate_crates(
             display_name,
             srctree / "rust" / display_name / "lib.rs",
             deps,
-            cfg=cfg,
+            cfg_groups=cfg_groups,
         )
         crate["env"]["OBJTREE"] = str(objtree.resolve(True))
         crate_with_generated: CrateWithGenerated = {
@@ -252,7 +251,7 @@ def generate_crates(
                 name,
                 path,
                 [core, kernel],
-                cfg=cfg,
+                cfg_groups=cfg_groups,
             )
 
     return crates
@@ -277,9 +276,21 @@ def main() -> None:
     # Making sure that the `sysroot` and `sysroot_src` belong to the same toolchain.
     assert args.sysroot in args.sysroot_src.parents
 
+    # 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, args.objtree, args.sysroot_src, args.exttree, args.cfgs),
+        "crates": generate_crates(
+            args.srctree,
+            args.objtree,
+            args.sysroot_src,
+            args.exttree,
+            args.cfgs,
+            list(cfg_groups.keys()),
+        ),
         "sysroot": str(args.sysroot),
+        "cfg_groups": cfg_groups,
     }
 
     json.dump(rust_project, sys.stdout, sort_keys=True, indent=4)

-- 
2.48.1


  parent reply	other threads:[~2025-03-22 13:24 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-03-22 13:23 [PATCH v4 00/11] rust: generate_rust_analyzer.py: define host crates and scripts Tamir Duberstein
2025-03-22 13:23 ` [PATCH v4 01/11] scripts: generate_rust_analyzer.py: add missing whitespace Tamir Duberstein
2025-03-25 13:08   ` Daniel Almeida
2025-03-22 13:23 ` [PATCH v4 02/11] scripts: generate_rust_analyzer.py: use double quotes Tamir Duberstein
2025-03-25 13:11   ` Daniel Almeida
2025-03-22 13:23 ` [PATCH v4 03/11] scripts: generate_rust_analyzer.py: add trailing comma Tamir Duberstein
2025-03-25 13:12   ` Daniel Almeida
2025-03-22 13:23 ` [PATCH v4 04/11] scripts: generate_rust_analyzer.py: extract `{build,register}_crate` Tamir Duberstein
2025-03-25 13:24   ` Daniel Almeida
2025-03-25 16:51   ` Fiona Behrens
2025-03-22 13:23 ` [PATCH v4 05/11] scripts: generate_rust_analyzer.py: add type hints Tamir Duberstein
2025-03-25 13:37   ` Daniel Almeida
2025-03-25 13:39     ` Daniel Almeida
2025-03-25 14:19       ` Miguel Ojeda
2025-03-25 14:40         ` Daniel Almeida
2025-03-25 16:47     ` Tamir Duberstein
2025-03-22 13:23 ` [PATCH v4 06/11] scripts: generate_rust_analyzer.py: use str(pathlib.Path) Tamir Duberstein
2025-03-25 13:56   ` Daniel Almeida
2025-03-22 13:23 ` [PATCH v4 07/11] scripts: generate_rust_analyzer.py: identify crates explicitly Tamir Duberstein
2025-03-25 14:01   ` Daniel Almeida
2025-03-22 13:23 ` [PATCH v4 08/11] scripts: generate_rust_analyzer.py: define host crates Tamir Duberstein
2025-03-25 14:05   ` Daniel Almeida
2025-03-22 13:23 ` [PATCH v4 09/11] scripts: generate_rust_analyzer.py: avoid FD leak Tamir Duberstein
2025-03-25 14:06   ` Daniel Almeida
2025-03-25 16:51   ` Fiona Behrens
2025-03-22 13:23 ` [PATCH v4 10/11] scripts: generate_rust_analyzer.py: define scripts Tamir Duberstein
2025-03-25 14:08   ` Daniel Almeida
2025-03-25 16:53   ` Fiona Behrens
2025-03-22 13:23 ` Tamir Duberstein [this message]
2025-03-23 12:40   ` [PATCH v4 11/11] scripts: generate_rust_analyzer.py: use `cfg_groups` Miguel Ojeda
2025-03-25 14:38   ` Daniel Almeida

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=20250322-rust-analyzer-host-v4-11-1f51f9c907eb@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=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®