From af96f99d83c8ee0dfc1b880bd7a0a6d443b94627 Mon Sep 17 00:00:00 2001 From: Seth Moore Date: Wed, 6 Oct 2021 10:45:34 -0700 Subject: Include proc macro crates in rust-project.json These crates were skipped before, leaving dependencies missing in rust-project.json. Include them and mark them as `"is_proc_macro": true` so that rust-analyzer can process them. Fixes: 202290038 Test: SOONG_GEN_RUST_PROJECT=1 m nothing Change-Id: Ia80e6f5e2f56a76608ba057075600e6b4424281b --- rust/project_json_test.go | 52 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) (limited to 'rust/project_json_test.go') diff --git a/rust/project_json_test.go b/rust/project_json_test.go index f7b668122..255b2e537 100644 --- a/rust/project_json_test.go +++ b/rust/project_json_test.go @@ -117,6 +117,58 @@ func TestProjectJsonDep(t *testing.T) { validateJsonCrates(t, jsonContent) } +func TestProjectJsonProcMacroDep(t *testing.T) { + bp := ` + rust_proc_macro { + name: "libproc_macro", + srcs: ["a/src/lib.rs"], + crate_name: "proc_macro" + } + rust_library { + name: "librust", + srcs: ["b/src/lib.rs"], + crate_name: "rust", + proc_macros: ["libproc_macro"], + } + ` + jsonContent := testProjectJson(t, bp) + crates := validateJsonCrates(t, jsonContent) + libproc_macro_count := 0 + librust_count := 0 + for _, c := range crates { + crate := validateCrate(t, c) + procMacro, ok := crate["is_proc_macro"].(bool) + if !ok { + t.Fatalf("Unexpected type for is_proc_macro: %v", crate["is_proc_macro"]) + } + + name, ok := crate["display_name"].(string) + if !ok { + t.Fatalf("Unexpected type for display_name: %v", crate["display_name"]) + } + + switch name { + case "libproc_macro": + libproc_macro_count += 1 + if !procMacro { + t.Fatalf("'libproc_macro' is marked with is_proc_macro=false") + } + case "librust": + librust_count += 1 + if procMacro { + t.Fatalf("'librust' is not a proc macro crate, but is marked with is_proc_macro=true") + } + default: + break + } + } + + if libproc_macro_count != 1 || librust_count != 1 { + t.Fatalf("Unexpected crate counts: libproc_macro_count: %v, librust_count: %v", + libproc_macro_count, librust_count) + } +} + func TestProjectJsonFeature(t *testing.T) { bp := ` rust_library { -- cgit v1.2.3-59-g8ed1b