Add a dedicated `append_proc_macro_crate` function to reduce overloading
in `append_crate`. This has the effect of removing `"is_proc_macro":
false` from the output; this field is interpreted as false if absent[1]
so this doesn't change the behavior of rust-analyzer.
Link: https://github.com/rust-lang/rust-analyzer/blob/8d01570b5e812a49daa1f08404269f6ea5dd73a1/crates/project-model/src/project_json.rs#L372-L373 [1]
Signed-off-by: Tamir Duberstein <tamird@gmail.com>
---
scripts/generate_rust_analyzer.py | 55 +++++++++++++++++++++++++++------------
1 file changed, 39 insertions(+), 16 deletions(-)
diff --git a/scripts/generate_rust_analyzer.py b/scripts/generate_rust_analyzer.py
index 71e6038964f6..80eb21c0d082 100755
--- a/scripts/generate_rust_analyzer.py
+++ b/scripts/generate_rust_analyzer.py
@@ -41,13 +41,11 @@ def generate_crates(srctree, objtree, sysroot_src, external_src, cfgs):
deps,
cfg=[],
is_workspace_member=True,
- is_proc_macro=False,
):
- crate = {
+ return {
"display_name": display_name,
"root_module": str(root_module),
"is_workspace_member": is_workspace_member,
- "is_proc_macro": is_proc_macro,
"deps": [{"crate": crates_indexes[dep], "name": dep} for dep in deps],
"cfg": cfg,
"edition": "2021",
@@ -55,13 +53,6 @@ def generate_crates(srctree, objtree, sysroot_src, external_src, cfgs):
"RUST_MODFILE": "This is only for rust-analyzer"
}
}
- if is_proc_macro:
- proc_macro_dylib_name = subprocess.check_output(
- [os.environ["RUSTC"], "--print", "file-names", "--crate-name", display_name, "--crate-type", "proc-macro", "-"],
- stdin=subprocess.DEVNULL,
- ).decode('utf-8').strip()
- crate["proc_macro_dylib_path"] = f"{objtree}/rust/{proc_macro_dylib_name}"
- return crate
def register_crate(crate):
crates_indexes[crate["display_name"]] = len(crates)
@@ -73,14 +64,48 @@ def generate_crates(srctree, objtree, sysroot_src, external_src, cfgs):
deps,
cfg=[],
is_workspace_member=True,
- is_proc_macro=False,
):
register_crate(
build_crate(
- display_name, root_module, deps, cfg, is_workspace_member, is_proc_macro
+ display_name,
+ root_module,
+ deps,
+ cfg,
+ is_workspace_member,
)
)
+ def append_proc_macro_crate(
+ display_name,
+ root_module,
+ deps,
+ cfg=[],
+ ):
+ crate = build_crate(display_name, root_module, deps, cfg)
+ proc_macro_dylib_name = (
+ subprocess.check_output(
+ [
+ os.environ["RUSTC"],
+ "--print",
+ "file-names",
+ "--crate-name",
+ display_name,
+ "--crate-type",
+ "proc-macro",
+ "-",
+ ],
+ stdin=subprocess.DEVNULL,
+ )
+ .decode("utf-8")
+ .strip()
+ )
+ proc_macro_crate = {
+ **crate,
+ "is_proc_macro": True,
+ "proc_macro_dylib_path": f"{objtree}/rust/{proc_macro_dylib_name}",
+ }
+ register_crate(proc_macro_crate)
+
def append_sysroot_crate(
display_name,
deps,
@@ -108,11 +133,10 @@ def generate_crates(srctree, objtree, sysroot_src, external_src, cfgs):
[],
)
- append_crate(
+ append_proc_macro_crate(
"macros",
srctree / "rust" / "macros" / "lib.rs",
["std", "proc_macro"],
- is_proc_macro=True,
)
append_crate(
@@ -121,12 +145,11 @@ def generate_crates(srctree, objtree, sysroot_src, external_src, cfgs):
["core", "compiler_builtins"],
)
- append_crate(
+ append_proc_macro_crate(
"pin_init_internal",
srctree / "rust" / "pin-init" / "internal" / "src" / "lib.rs",
[],
cfg=["kernel"],
- is_proc_macro=True,
)
append_crate(
--
2.49.0On Tue, Mar 25, 2025 at 3:06 PM Tamir Duberstein <tamird@gmail.com> wrote: > > Add a dedicated `append_proc_macro_crate` function to reduce overloading > in `append_crate`. This has the effect of removing `"is_proc_macro": > false` from the output; this field is interpreted as false if absent[1] > so this doesn't change the behavior of rust-analyzer. > > Link: https://github.com/rust-lang/rust-analyzer/blob/8d01570b5e812a49daa1f08404269f6ea5dd73a1/crates/project-model/src/project_json.rs#L372-L373 [1] > Signed-off-by: Tamir Duberstein <tamird@gmail.com> > --- > scripts/generate_rust_analyzer.py | 55 +++++++++++++++++++++++++++------------ > 1 file changed, 39 insertions(+), 16 deletions(-) Reviewed-by: Trevor Gross <tmgross@umich.edu>
Hi Tamir
> On 25 Mar 2025, at 17:06, Tamir Duberstein <tamird@gmail.com> wrote:
>
> Add a dedicated `append_proc_macro_crate` function to reduce overloading
> in `append_crate`. This has the effect of removing `"is_proc_macro":
> false` from the output; this field is interpreted as false if absent[1]
> so this doesn't change the behavior of rust-analyzer.
>
> Link: https://github.com/rust-lang/rust-analyzer/blob/8d01570b5e812a49daa1f08404269f6ea5dd73a1/crates/project-model/src/project_json.rs#L372-L373 [1]
> Signed-off-by: Tamir Duberstein <tamird@gmail.com>
> ---
> scripts/generate_rust_analyzer.py | 55 +++++++++++++++++++++++++++------------
> 1 file changed, 39 insertions(+), 16 deletions(-)
>
> diff --git a/scripts/generate_rust_analyzer.py b/scripts/generate_rust_analyzer.py
> index 71e6038964f6..80eb21c0d082 100755
> --- a/scripts/generate_rust_analyzer.py
> +++ b/scripts/generate_rust_analyzer.py
> @@ -41,13 +41,11 @@ def generate_crates(srctree, objtree, sysroot_src, external_src, cfgs):
> deps,
> cfg=[],
> is_workspace_member=True,
> - is_proc_macro=False,
> ):
> - crate = {
> + return {
> "display_name": display_name,
> "root_module": str(root_module),
> "is_workspace_member": is_workspace_member,
> - "is_proc_macro": is_proc_macro,
> "deps": [{"crate": crates_indexes[dep], "name": dep} for dep in deps],
> "cfg": cfg,
> "edition": "2021",
> @@ -55,13 +53,6 @@ def generate_crates(srctree, objtree, sysroot_src, external_src, cfgs):
> "RUST_MODFILE": "This is only for rust-analyzer"
> }
> }
> - if is_proc_macro:
> - proc_macro_dylib_name = subprocess.check_output(
> - [os.environ["RUSTC"], "--print", "file-names", "--crate-name", display_name, "--crate-type", "proc-macro", "-"],
> - stdin=subprocess.DEVNULL,
> - ).decode('utf-8').strip()
> - crate["proc_macro_dylib_path"] = f"{objtree}/rust/{proc_macro_dylib_name}"
> - return crate
>
> def register_crate(crate):
> crates_indexes[crate["display_name"]] = len(crates)
> @@ -73,14 +64,48 @@ def generate_crates(srctree, objtree, sysroot_src, external_src, cfgs):
> deps,
> cfg=[],
> is_workspace_member=True,
> - is_proc_macro=False,
> ):
> register_crate(
> build_crate(
> - display_name, root_module, deps, cfg, is_workspace_member, is_proc_macro
> + display_name,
> + root_module,
> + deps,
> + cfg,
> + is_workspace_member,
> )
> )
>
> + def append_proc_macro_crate(
> + display_name,
> + root_module,
> + deps,
> + cfg=[],
> + ):
> + crate = build_crate(display_name, root_module, deps, cfg)
> + proc_macro_dylib_name = (
> + subprocess.check_output(
> + [
> + os.environ["RUSTC"],
> + "--print",
> + "file-names",
> + "--crate-name",
> + display_name,
> + "--crate-type",
> + "proc-macro",
> + "-",
> + ],
> + stdin=subprocess.DEVNULL,
> + )
> + .decode("utf-8")
> + .strip()
> + )
> + proc_macro_crate = {
> + **crate,
> + "is_proc_macro": True,
> + "proc_macro_dylib_path": f"{objtree}/rust/{proc_macro_dylib_name}",
> + }
> + register_crate(proc_macro_crate)
> +
> def append_sysroot_crate(
> display_name,
> deps,
> @@ -108,11 +133,10 @@ def generate_crates(srctree, objtree, sysroot_src, external_src, cfgs):
> [],
> )
>
> - append_crate(
> + append_proc_macro_crate(
> "macros",
> srctree / "rust" / "macros" / "lib.rs",
> ["std", "proc_macro"],
> - is_proc_macro=True,
> )
>
> append_crate(
> @@ -121,12 +145,11 @@ def generate_crates(srctree, objtree, sysroot_src, external_src, cfgs):
> ["core", "compiler_builtins"],
> )
>
> - append_crate(
> + append_proc_macro_crate(
> "pin_init_internal",
> srctree / "rust" / "pin-init" / "internal" / "src" / "lib.rs",
> [],
> cfg=["kernel"],
> - is_proc_macro=True,
> )
>
> append_crate(
>
> --
> 2.49.0
>
>
In terms of testing, a diff shows that the only change to the output is the removal of `is_proc_macro: false`
as indicated by the commit message.
This looks good to me.
Tested-by: Daniel Almeida <daniel.almeida@collabora.com>
Reviewed-by: Daniel Almeida <daniel.almeida@collabora.com>
— Daniel
© 2016 - 2026 Red Hat, Inc.