Improve merging in all_crate_deps

Author: dzbarsky

rs/BUILD.bazel

@@ -13,6 +13,7 @@ bzl_library(
         "//rs/private:downloader",
         "//rs/private:git_repository",
         "//rs/private:resolver",
+        "//rs/private:select_utils",
         "//rs/private:semver",
         "//rs/private:toml2json",
         "@aspect_tools_telemetry_report//:defs.bzl",
@@ -32,47 +33,68 @@ bzl_library(
     name = "cargo_build_script",
     srcs = ["cargo_build_script.bzl"],
     visibility = ["//visibility:public"],
-    deps = ["@rules_rust//cargo/private:bzl_lib"],
+    deps = [
+        "@bazel_features//:features",
+        "@rules_rust//cargo/private:bzl_lib",
+    ],
 )
 
 bzl_library(
     name = "rust_binary",
     srcs = ["rust_binary.bzl"],
     visibility = ["//visibility:public"],
-    deps = ["@rules_rust//rust:bzl_lib"],
+    deps = [
+        "@bazel_features//:features",
+        "@rules_rust//rust:bzl_lib",
+    ],
 )
 
 bzl_library(
     name = "rust_library",
     srcs = ["rust_library.bzl"],
     visibility = ["//visibility:public"],
-    deps = ["@rules_rust//rust:bzl_lib"],
+    deps = [
+        "@bazel_features//:features",
+        "@rules_rust//rust:bzl_lib",
+    ],
 )
 
 bzl_library(
     name = "rust_proc_macro",
     srcs = ["rust_proc_macro.bzl"],
     visibility = ["//visibility:public"],
-    deps = ["@rules_rust//rust:bzl_lib"],
+    deps = [
+        "@bazel_features//:features",
+        "@rules_rust//rust:bzl_lib",
+    ],
 )
 
 bzl_library(
     name = "rust_test",
     srcs = ["rust_test.bzl"],
     visibility = ["//visibility:public"],
-    deps = ["@rules_rust//rust:bzl_lib"],
+    deps = [
+        "@bazel_features//:features",
+        "@rules_rust//rust:bzl_lib",
+    ],
 )
 
 bzl_library(
     name = "rust_shared_library",
     srcs = ["rust_shared_library.bzl"],
     visibility = ["//visibility:public"],
-    deps = ["@rules_rust//rust:bzl_lib"],
+    deps = [
+        "@bazel_features//:features",
+        "@rules_rust//rust:bzl_lib",
+    ],
 )
 
 bzl_library(
     name = "rust_static_library",
     srcs = ["rust_static_library.bzl"],
     visibility = ["//visibility:public"],
-    deps = ["@rules_rust//rust:bzl_lib"],
+    deps = [
+        "@bazel_features//:features",
+        "@rules_rust//rust:bzl_lib",
+    ],
 )

rs/extensions.bzl

@@ -11,6 +11,7 @@ load("//rs/private:downloader.bzl", "download_metadata_for_git_crates", "downloa
 load("//rs/private:git_repository.bzl", "git_repository")
 load("//rs/private:repository_utils.bzl", "render_select")
 load("//rs/private:resolver.bzl", "resolve")
+load("//rs/private:select_utils.bzl", "compute_select")
 load("//rs/private:semver.bzl", "select_matching_version")
 load("//rs/private:toml2json.bzl", "run_toml2json")
 
@@ -31,6 +32,31 @@ def _platform(triple, use_experimental_platforms):
 def _select(items):
     return {k: sorted(v) for k, v in items.items()}
 
+def _shared_and_per_platform(platform_items, use_experimental_platforms):
+    if not platform_items:
+        return [], {}
+
+    by_platform = {}
+    for triple, items in platform_items.items():
+        platform = _platform(triple, use_experimental_platforms)
+        existing = by_platform.get(platform)
+        if existing == None:
+            by_platform[platform] = set(items)
+        else:
+            existing.update(items)
+
+    deps, per_platform = compute_select([], by_platform)
+    return sorted(deps), per_platform
+
+def _render_string_list(items):
+    return ",\n            ".join(['"%s"' % item for item in sorted(items)])
+
+def _render_string_list_dict(items_by_key):
+    rendered = []
+    for key, items in sorted(items_by_key.items()):
+        rendered.append('"%s": [%s]' % (key, ", ".join(['"%s"' % item for item in sorted(items)])))
+    return ",\n            ".join(rendered)
+
 def _cfg_match_info_for_target(target, platform_cfg_attrs, cfg_match_cache):
     match_info = cfg_match_cache.get(target)
     if match_info:
@@ -845,10 +871,20 @@ filegroup(
         ),
     )
 
+    resolved_platforms = []
+    for triple in platform_triples:
+        platform = _platform(triple, use_experimental_platforms)
+        if platform not in resolved_platforms:
+            resolved_platforms.append(platform)
+
     defs_bzl_contents = \
         """load(":data.bzl", "DEP_DATA")
 load("@rules_rs//rs/private:all_crate_deps.bzl", _all_crate_deps = "all_crate_deps")
 
+_PLATFORMS = [
+    {platforms}
+]
+
 def aliases(package_name = None):
     dep_data = DEP_DATA.get(package_name or native.package_name())
     if not dep_data:
@@ -869,6 +905,7 @@ def all_crate_deps(
 
     return _all_crate_deps(
         dep_data,
+        platforms = _PLATFORMS,
         normal = normal,
         normal_dev = normal_dev,
         build = build,
@@ -880,7 +917,8 @@ RESOLVED_PLATFORMS = select({{
     "//conditions:default": ["@platforms//:incompatible"],
 }})
 """.format(
-            target_compatible_with = ",\n    ".join(['"%s": []' % _platform(triple, use_experimental_platforms) for triple in platform_triples]),
+            platforms = _render_string_list(resolved_platforms),
+            target_compatible_with = ",\n    ".join(['"%s": []' % platform for platform in resolved_platforms]),
             this_repo = repr("@" + hub_name + "//:"),
         )
 
@@ -939,9 +977,9 @@ RESOLVED_PLATFORMS = select({{
 
         bazel_package = paths.join(workspace_package, package_dir)
 
-        deps, conditional_deps = render_select([], deps, use_experimental_platforms)
-        build_deps, conditional_build_deps = render_select([], build_deps, use_experimental_platforms)
-        dev_deps, conditional_dev_deps = render_select([], dev_deps, use_experimental_platforms)
+        deps, deps_by_platform = _shared_and_per_platform(deps, use_experimental_platforms)
+        build_deps, build_deps_by_platform = _shared_and_per_platform(build_deps, use_experimental_platforms)
+        dev_deps, dev_deps_by_platform = _shared_and_per_platform(dev_deps, use_experimental_platforms)
 
         workspace_dep_stanzas.append("""
     {bazel_package}: {{
@@ -950,13 +988,22 @@ RESOLVED_PLATFORMS = select({{
         }},
         "deps": [
             {deps}
-        ]{conditional_deps},
+        ],
+        "deps_by_platform": {{
+            {deps_by_platform}
+        }},
         "build_deps": [
             {build_deps}
-        ]{conditional_build_deps},
+        ],
+        "build_deps_by_platform": {{
+            {build_deps_by_platform}
+        }},
         "dev_deps": [
             {dev_deps}
-        ]{conditional_dev_deps},
+        ],
+        "dev_deps_by_platform": {{
+            {dev_deps_by_platform}
+        }},
         "binaries": {{
             {binaries}
         }},
@@ -966,12 +1013,12 @@ RESOLVED_PLATFORMS = select({{
     }},""".format(
             bazel_package = repr(bazel_package),
             aliases = ",\n            ".join(['"%s": "%s"' % kv for kv in sorted(aliases.items())]),
-            deps = ",\n            ".join(['"%s"' % d for d in sorted(deps)]),
-            conditional_deps = " + " + conditional_deps if conditional_deps else "",
-            build_deps = ",\n            ".join(['"%s"' % d for d in sorted(build_deps)]),
-            conditional_build_deps = " + " + conditional_build_deps if conditional_build_deps else "",
-            dev_deps = ",\n            ".join(['"%s"' % d for d in sorted(dev_deps)]),
-            conditional_dev_deps = " + " + conditional_dev_deps if conditional_dev_deps else "",
+            deps = _render_string_list(deps),
+            deps_by_platform = _render_string_list_dict(deps_by_platform),
+            build_deps = _render_string_list(build_deps),
+            build_deps_by_platform = _render_string_list_dict(build_deps_by_platform),
+            dev_deps = _render_string_list(dev_deps),
+            dev_deps_by_platform = _render_string_list_dict(dev_deps_by_platform),
             binaries = ",\n            ".join(['"%s": "%s"' % kv for kv in sorted(binaries.items())]),
             shared_libraries = ",\n            ".join(['"%s": "%s"' % kv for kv in sorted(shared_libraries.items())]),
         ))

rs/private/BUILD.bazel

@@ -1,7 +1,10 @@
 load("@bazel_lib//:bzl_library.bzl", "bzl_library")
+load(":all_crate_deps_test.bzl", "all_crate_deps_tests")
 load(":cfg_parser_test.bzl", "cfg_parser_tests")
 load(":semver_test.bzl", "semver_select_tests")
 
+all_crate_deps_tests()
+
 cfg_parser_tests()
 
 semver_select_tests()
@@ -10,7 +13,7 @@ bzl_library(
     name = "all_crate_deps",
     srcs = ["all_crate_deps.bzl"],
     visibility = ["//rs:__subpackages__"],
-    deps = [],
+    deps = [":select_utils"],
 )
 
 bzl_library(
@@ -64,7 +67,10 @@ bzl_library(
     name = "repository_utils",
     srcs = ["repository_utils.bzl"],
     visibility = ["//rs:__subpackages__"],
-    deps = [":semver"],
+    deps = [
+        ":select_utils",
+        ":semver",
+    ],
 )
 
 bzl_library(
@@ -176,6 +182,13 @@ bzl_library(
     name = "resolver",
     srcs = ["resolver.bzl"],
     visibility = ["//rs:__subpackages__"],
+    deps = [":cfg_parser"],
+)
+
+bzl_library(
+    name = "select_utils",
+    srcs = ["select_utils.bzl"],
+    visibility = ["//rs:__subpackages__"],
 )
 
 bzl_library(

rs/private/all_crate_deps.bzl

@@ -1,30 +1,67 @@
+load(":select_utils.bzl", "compute_select")
+
 def _filter_by_prefix(deps, prefix):
     return [dep for dep in deps if dep.startswith(prefix)]
 
+def _kind_dep_spec(dep_data, kind):
+    return (
+        dep_data.get(kind, []),
+        dep_data.get(kind + "_by_platform", {}),
+    )
+
+def merge_structured_dep_specs(specs, platforms, filter_prefix):
+    merged_by_platform = {}
+    merged_deps = set()
+
+    for platform in platforms:
+        merged_by_platform[platform] = set()
+
+    for shared_items, per_platform_items in specs:
+        for dep in shared_items:
+            if not filter_prefix or dep.startswith(filter_prefix):
+                merged_deps.add(dep)
+
+        for platform, deps in per_platform_items.items():
+            filtered = _filter_by_prefix(deps, filter_prefix) if filter_prefix else deps
+            if not filtered:
+                continue
+
+            existing = merged_by_platform.get(platform)
+            if existing == None:
+                merged_by_platform[platform] = set(filtered)
+                continue
+
+            existing.update(filtered)
+
+    deps, per_platform = compute_select(merged_deps, merged_by_platform)
+    return sorted(deps), per_platform
+
 def all_crate_deps(
         dep_data,
+        platforms,
         normal = False,
         normal_dev = False,
         build = False,
         filter_prefix = None):
-    to_return = []
-
-    deps = dep_data["deps"]
-    build_deps = dep_data["build_deps"]
-    dev_deps = dep_data["dev_deps"]
-
-    if filter_prefix:
-        deps = _filter_by_prefix(deps, filter_prefix)
-        build_deps = _filter_by_prefix(build_deps, filter_prefix)
-        dev_deps = _filter_by_prefix(dev_deps, filter_prefix)
+    specs = []
 
     if normal_dev:
-        to_return += dev_deps
+        specs.append(_kind_dep_spec(dep_data, "dev_deps"))
 
     if build:
-        to_return += build_deps
+        specs.append(_kind_dep_spec(dep_data, "build_deps"))
+
+    if normal or not specs:
+        specs.append(_kind_dep_spec(dep_data, "deps"))
 
-    if normal or not to_return:
-        to_return += deps
+    deps, per_platform = merge_structured_dep_specs(
+        specs,
+        platforms,
+        filter_prefix,
+    )
+    if not per_platform:
+        return deps
 
-    return to_return
+    branches = {platform: deps for platform, deps in sorted(per_platform.items())}
+    branches["//conditions:default"] = []
+    return deps + select(branches)