Skip to content

Commit 3418d86

Browse files
committed
Merge tag 'rust-analyzer-v7.1' of https://github.com/Rust-for-Linux/linux into rust-next
Pull rust-analyzer updates from Tamir Duberstein: - Add type annotations to 'generate_rust_analyzer.py'. - Add support for scripts written in Rust ('generate_rust_target.rs', 'rustdoc_test_builder.rs', 'rustdoc_test_gen.rs'). - Refactor 'generate_rust_analyzer.py' to explicitly identify host and target crates, improve readability, and reduce duplication. * tag 'rust-analyzer-v7.1' of https://github.com/Rust-for-Linux/linux: scripts: generate_rust_analyzer.py: reduce cfg plumbing scripts: generate_rust_analyzer.py: rename cfg to generated_cfg scripts: generate_rust_analyzer.py: avoid FD leak scripts: generate_rust_analyzer.py: define scripts scripts: generate_rust_analyzer.py: identify crates explicitly scripts: generate_rust_analyzer.py: add type hints scripts: generate_rust_analyzer.py: drop `"is_proc_macro": false` scripts: generate_rust_analyzer.py: extract `{build,register}_crate`
2 parents 3a2486c + 5c8d16a commit 3418d86

2 files changed

Lines changed: 211 additions & 77 deletions

File tree

rust/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -610,6 +610,8 @@ rust-analyzer:
610610
--cfgs='proc_macro2=$(proc_macro2-cfgs)' \
611611
--cfgs='quote=$(quote-cfgs)' \
612612
--cfgs='syn=$(syn-cfgs)' \
613+
--cfgs='pin_init_internal=$(pin_init_internal-cfgs)' \
614+
--cfgs='pin_init=$(pin_init-cfgs)' \
613615
$(realpath $(srctree)) $(realpath $(objtree)) \
614616
$(rustc_sysroot) $(RUST_LIB_SRC) $(if $(KBUILD_EXTMOD),$(srcroot)) \
615617
> rust-project.json

0 commit comments

Comments
 (0)