mirror of
https://github.com/torvalds/linux.git
synced 2024-11-10 14:11:52 +00:00
fe99216357
Sets the `sysroot` field in rust-project.json which is now needed in newer versions of rust-analyzer instead of the `sysroot_src` field. Till [1] `rust-analyzer` used to guess the `sysroot` based on the `sysroot_src` at [2]. Now `sysroot` is a required parameter for a `rust-project.json` file. It is required because `rust-analyzer` need it to find the proc-macro server [3]. In the current version of `rust-analyzer` the `sysroot_src` is only used to include the inbuilt library crates (std, core, alloc, etc) [4]. Since we already specify the core library to be included in the `rust-project.json` we don't need to define the `sysroot_src`. Code editors like VS Code try to use the latest version of rust-analyzer (which is updated every week) instead of the version of rust-analyzer that comes with the rustup toolchain (which is updated every six weeks along with the rust version). Without this change `rust-analyzer` is breaking for anyone using VS Code. As they are getting the latest version of `rust-analyzer` with the changes made in [1]. `rust-analyzer` will also start breaking for other developers as they update their rust version (assuming that also updates the rust-analyzer version on their system). This patch should work with every setup as there is no more guess work being done by `rust-analyzer`. [ Lukas, who leads the rust-analyzer team, says: `sysroot_src` is required now if you want to have the sysroot source libraries be loaded. I think we used to infer it as `{sysroot}/lib/rustlib/src/rust/library` before when only the `sysroot` field was given but that was since changed to make it possible in having a sysroot without the standard library sources (that is only have the binaries available). So if you want the library sources to be loaded by rust-analyzer you will have to set that field as well now. - Miguel ] Link: https://github.com/rust-lang/rust-analyzer/pull/17287 [1] Link:f372a8a117/crates/project-model/src/workspace.rs (L367-L374)
[2] Link:eeb192b79a/crates/project-model/src/sysroot.rs (L180-L192)
[3] Link: https://github.com/search?q=repo%3AVeykril%2Frust-analyzer%20src_root()&type=code [4] Tested-by: Dirk Behme <dirk.behme@de.bosch.com> Signed-off-by: Sarthak Singh <sarthak.singh99@gmail.com> Link: https://rust-for-linux.zulipchat.com/#narrow/stream/291565-Help/topic/How.20to.20rust-analyzer.20correctly.20working Link: https://lore.kernel.org/r/20240724172713.899399-1-sarthak.singh99@gmail.com [ Formatted comment, fixed typo and removed spurious empty line. - Miguel ] Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
170 lines
5.0 KiB
Python
Executable File
170 lines
5.0 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
# SPDX-License-Identifier: GPL-2.0
|
|
"""generate_rust_analyzer - Generates the `rust-project.json` file for `rust-analyzer`.
|
|
"""
|
|
|
|
import argparse
|
|
import json
|
|
import logging
|
|
import os
|
|
import pathlib
|
|
import sys
|
|
|
|
def args_crates_cfgs(cfgs):
|
|
crates_cfgs = {}
|
|
for cfg in cfgs:
|
|
crate, vals = cfg.split("=", 1)
|
|
crates_cfgs[crate] = vals.replace("--cfg", "").split()
|
|
|
|
return crates_cfgs
|
|
|
|
def generate_crates(srctree, objtree, sysroot_src, external_src, cfgs):
|
|
# 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 -- dependencies need to come first.
|
|
#
|
|
# Avoid O(n^2) iterations by keeping a map of indexes.
|
|
crates = []
|
|
crates_indexes = {}
|
|
crates_cfgs = args_crates_cfgs(cfgs)
|
|
|
|
def append_crate(display_name, root_module, deps, cfg=[], is_workspace_member=True, is_proc_macro=False):
|
|
crates_indexes[display_name] = len(crates)
|
|
crates.append({
|
|
"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",
|
|
"env": {
|
|
"RUST_MODFILE": "This is only for rust-analyzer"
|
|
}
|
|
})
|
|
|
|
# First, the ones in `rust/` since they are a bit special.
|
|
append_crate(
|
|
"core",
|
|
sysroot_src / "core" / "src" / "lib.rs",
|
|
[],
|
|
cfg=crates_cfgs.get("core", []),
|
|
is_workspace_member=False,
|
|
)
|
|
|
|
append_crate(
|
|
"compiler_builtins",
|
|
srctree / "rust" / "compiler_builtins.rs",
|
|
[],
|
|
)
|
|
|
|
append_crate(
|
|
"alloc",
|
|
sysroot_src / "alloc" / "src" / "lib.rs",
|
|
["core", "compiler_builtins"],
|
|
cfg=crates_cfgs.get("alloc", []),
|
|
)
|
|
|
|
append_crate(
|
|
"macros",
|
|
srctree / "rust" / "macros" / "lib.rs",
|
|
[],
|
|
is_proc_macro=True,
|
|
)
|
|
crates[-1]["proc_macro_dylib_path"] = f"{objtree}/rust/libmacros.so"
|
|
|
|
append_crate(
|
|
"build_error",
|
|
srctree / "rust" / "build_error.rs",
|
|
["core", "compiler_builtins"],
|
|
)
|
|
|
|
append_crate(
|
|
"bindings",
|
|
srctree / "rust"/ "bindings" / "lib.rs",
|
|
["core"],
|
|
cfg=cfg,
|
|
)
|
|
crates[-1]["env"]["OBJTREE"] = str(objtree.resolve(True))
|
|
|
|
append_crate(
|
|
"kernel",
|
|
srctree / "rust" / "kernel" / "lib.rs",
|
|
["core", "alloc", "macros", "build_error", "bindings"],
|
|
cfg=cfg,
|
|
)
|
|
crates[-1]["source"] = {
|
|
"include_dirs": [
|
|
str(srctree / "rust" / "kernel"),
|
|
str(objtree / "rust")
|
|
],
|
|
"exclude_dirs": [],
|
|
}
|
|
|
|
def is_root_crate(build_file, target):
|
|
try:
|
|
return f"{target}.o" in open(build_file).read()
|
|
except FileNotFoundError:
|
|
return False
|
|
|
|
# Then, the rest outside of `rust/`.
|
|
#
|
|
# We explicitly mention the top-level folders we want to cover.
|
|
extra_dirs = map(lambda dir: srctree / dir, ("samples", "drivers"))
|
|
if external_src is not None:
|
|
extra_dirs = [external_src]
|
|
for folder in extra_dirs:
|
|
for path in folder.rglob("*.rs"):
|
|
logging.info("Checking %s", path)
|
|
name = path.name.replace(".rs", "")
|
|
|
|
# Skip those that are not crate roots.
|
|
if not is_root_crate(path.parent / "Makefile", name) and \
|
|
not is_root_crate(path.parent / "Kbuild", name):
|
|
continue
|
|
|
|
logging.info("Adding %s", name)
|
|
append_crate(
|
|
name,
|
|
path,
|
|
["core", "alloc", "kernel"],
|
|
cfg=cfg,
|
|
)
|
|
|
|
return crates
|
|
|
|
def main():
|
|
parser = argparse.ArgumentParser()
|
|
parser.add_argument('--verbose', '-v', action='store_true')
|
|
parser.add_argument('--cfgs', action='append', default=[])
|
|
parser.add_argument("srctree", type=pathlib.Path)
|
|
parser.add_argument("objtree", type=pathlib.Path)
|
|
parser.add_argument("sysroot", type=pathlib.Path)
|
|
parser.add_argument("sysroot_src", type=pathlib.Path)
|
|
parser.add_argument("exttree", type=pathlib.Path, nargs="?")
|
|
args = parser.parse_args()
|
|
|
|
logging.basicConfig(
|
|
format="[%(asctime)s] [%(levelname)s] %(message)s",
|
|
level=logging.INFO if args.verbose else logging.WARNING
|
|
)
|
|
|
|
# Making sure that the `sysroot` and `sysroot_src` belong to the same toolchain.
|
|
assert args.sysroot in args.sysroot_src.parents
|
|
|
|
rust_project = {
|
|
"crates": generate_crates(args.srctree, args.objtree, args.sysroot_src, args.exttree, args.cfgs),
|
|
"sysroot": str(args.sysroot),
|
|
}
|
|
|
|
json.dump(rust_project, sys.stdout, sort_keys=True, indent=4)
|
|
|
|
if __name__ == "__main__":
|
|
main()
|