Traverse custom alias-like rules in the rust analyzer aspect (#1190)

docs/flatten.md

@@ -1740,6 +1740,7 @@ Annotates rust rules with RustAnalyzerInfo later used to build a rust-project.js
 | deps| String |
 | proc_macro_deps| String |
 | crate| String |
+| actual| String |
 
 
 **ATTRIBUTES**

docs/rust_analyzer.md

@@ -109,6 +109,7 @@ Annotates rust rules with RustAnalyzerInfo later used to build a rust-project.js
 | deps| String |
 | proc_macro_deps| String |
 | crate| String |
+| actual| String |
 
 
 **ATTRIBUTES**

rust/private/rust_analyzer.bzl

@@ -52,17 +52,21 @@ def _rust_analyzer_aspect_impl(target, ctx):
     if hasattr(ctx.rule.attr, "rustc_flags"):
         cfgs += [f[6:] for f in ctx.rule.attr.rustc_flags if f.startswith("--cfg ") or f.startswith("--cfg=")]
 
-    # Save BuildInfo if we find any (for build script output)
     build_info = None
-    for dep in ctx.rule.attr.deps:
-        if BuildInfo in dep:
-            build_info = dep[BuildInfo]
+    dep_infos = []
+    if hasattr(ctx.rule.attr, "deps"):
+        for dep in ctx.rule.attr.deps:
+            # Save BuildInfo if we find any (for build script output)
+            if BuildInfo in dep:
+                build_info = dep[BuildInfo]
+        dep_infos = [dep[RustAnalyzerInfo] for dep in ctx.rule.attr.deps if RustAnalyzerInfo in dep]
 
-    dep_infos = [dep[RustAnalyzerInfo] for dep in ctx.rule.attr.deps if RustAnalyzerInfo in dep]
     if hasattr(ctx.rule.attr, "proc_macro_deps"):
         dep_infos += [dep[RustAnalyzerInfo] for dep in ctx.rule.attr.proc_macro_deps if RustAnalyzerInfo in dep]
     if hasattr(ctx.rule.attr, "crate") and ctx.rule.attr.crate != None:
         dep_infos.append(ctx.rule.attr.crate[RustAnalyzerInfo])
+    if hasattr(ctx.rule.attr, "actual") and ctx.rule.attr.actual != None and RustAnalyzerInfo in ctx.rule.attr.actual:
+        dep_infos.append(ctx.rule.attr.actual[RustAnalyzerInfo])
 
     crate_spec = ctx.actions.declare_file(ctx.label.name + ".rust_analyzer_crate_spec")
 
@@ -111,7 +115,7 @@ def find_proc_macro_dylib_path(toolchain, target):
     return None
 
 rust_analyzer_aspect = aspect(
-    attr_aspects = ["deps", "proc_macro_deps", "crate"],
+    attr_aspects = ["deps", "proc_macro_deps", "crate", "actual"],
     implementation = _rust_analyzer_aspect_impl,
     toolchains = [str(Label("//rust:toolchain"))],
     incompatible_use_toolchain_transition = True,

test/rust_analyzer/aspect_traversal_test/BUILD.bazel

@@ -1,11 +1,13 @@
 load("@rules_rust//rust:defs.bzl", "rust_library", "rust_proc_macro", "rust_test")
+load(":custom_alias.bzl", "custom_alias")
 
 rust_library(
     name = "mylib",
     srcs = ["mylib.rs"],
     proc_macro_deps = [":proc_macro_dep"],
     deps = [
         ":alias_dep",
+        ":custom_alias_dep",
         ":lib_dep",
     ],
 )
@@ -31,6 +33,22 @@ rust_library(
     srcs = ["dep_of_aliased_dep.rs"],
 )
 
+custom_alias(
+    name = "custom_alias_dep",
+    actual = ":custom_actual_dep",
+)
+
+rust_library(
+    name = "custom_actual_dep",
+    srcs = ["custom_actual_dep.rs"],
+    deps = [":dep_of_custom_aliased_dep"],
+)
+
+rust_library(
+    name = "dep_of_custom_aliased_dep",
+    srcs = ["dep_of_custom_aliased_dep.rs"],
+)
+
 rust_proc_macro(
     name = "proc_macro_dep",
     srcs = ["proc_macro_dep.rs"],

test/rust_analyzer/aspect_traversal_test/custom_actual_dep.rs

@@ -0,0 +1 @@
+

test/rust_analyzer/aspect_traversal_test/custom_alias.bzl

@@ -0,0 +1,17 @@
+"""Alias-like rule for testing."""
+
+load("@rules_rust//rust:defs.bzl", "rust_common")
+
+def _custom_alias_impl(ctx):
+    actual = ctx.attr.actual
+    return [actual[rust_common.crate_info], actual[rust_common.dep_info]]
+
+custom_alias = rule(
+    implementation = _custom_alias_impl,
+    attrs = {
+        "actual": attr.label(
+            allow_single_file = True,
+            mandatory = True,
+        ),
+    },
+)

test/rust_analyzer/aspect_traversal_test/dep_of_custom_aliased_dep.rs

@@ -0,0 +1 @@
+

test/rust_analyzer/aspect_traversal_test/rust_project_json_test.rs

@@ -14,6 +14,8 @@ mod tests {
             "lib_dep",
             "actual_dep",
             "dep_of_aliased_dep",
+            "custom_actual_dep",
+            "dep_of_custom_aliased_dep",
             "extra_test_dep",
             "proc_macro_dep",
             "extra_proc_macro_dep",