Simplify proc_macro_deps handling

dzbarsky · dzbarsky · commit ef67c6ca7e03 · 2026-02-25T04:18:16.000-05:00
diff --git a/README.md b/README.md
@@ -39,7 +39,6 @@ rust_library(
     srcs = ["src/lib.rs"],
     aliases = aliases(),
     deps = all_crate_deps(normal = True),
-    proc_macro_deps = all_crate_deps(proc_macro = True),
 )
 
 rust_binary(
diff --git a/rs/experimental/rules_rust.bzl b/rs/experimental/rules_rust.bzl
@@ -31,9 +31,9 @@ def _rules_rust_impl(mctx):
 
     http_archive(
         name = "rules_rust",
-        integrity = "sha256-V+eBheeZ5dsBLZ6jhs1M9vujO+wjrN1P9IiBRF5GZXg=",
-        strip_prefix = "rules_rust-7531189d2a78d8740af63035677a1cb097549584",
-        url = "https://github.com/dzbarsky/rules_rust/archive/7531189d2a78d8740af63035677a1cb097549584.tar.gz",
+        integrity = "sha256-38JNH7qjz3r/AwXmeWReln+6SdozNP1LlIRzB2U8DqA=",
+        strip_prefix = "rules_rust-684b22041ad510e07a9405b839d1452438f41ec8",
+        url = "https://github.com/dzbarsky/rules_rust/archive/684b22041ad510e07a9405b839d1452438f41ec8.tar.gz",
         patches = patches,
         patch_strip = strip,
     )
diff --git a/rs/extensions.bzl b/rs/extensions.bzl
@@ -770,10 +770,7 @@ def aliases(package_name = None):
 def all_crate_deps(
         normal = False,
         normal_dev = False,
-        proc_macro = False,
-        proc_macro_dev = False,
         build = False,
-        build_proc_macro = False,
         package_name = None,
         cargo_only = False):
 
@@ -785,10 +782,7 @@ def all_crate_deps(
         dep_data,
         normal = normal,
         normal_dev = normal_dev,
-        proc_macro = proc_macro,
-        proc_macro_dev = proc_macro_dev,
         build = build,
-        build_proc_macro = build_proc_macro,
         filter_prefix = {this_repo} if cargo_only else None,
     )
 
@@ -1130,9 +1124,6 @@ _annotation = tag_class(
         # "build_script_link_deps": _relative_label_list(
         #     doc = "A list of labels to add to a crate's `cargo_build_script::link_deps` attribute.",
         # ),
-        # "build_script_proc_macro_deps": _relative_label_list(
-        #     doc = "A list of labels to add to a crate's `cargo_build_script::proc_macro_deps` attribute.",
-        # ),
         # "build_script_rundir": attr.string(
         #     doc = "An override for the build script's rundir attribute.",
         # ),
@@ -1213,9 +1204,6 @@ _annotation = tag_class(
         "patches": attr.label_list(
             doc = "The `patches` attribute of a Bazel repository rule. See [http_archive.patches](https://docs.bazel.build/versions/main/repo/http.html#http_archive-patches)",
         ),
-        # "proc_macro_deps": _relative_label_list(
-        #     doc = "A list of labels to add to a crate's `rust_library::proc_macro_deps` attribute.",
-        # ),
         # "rustc_env": attr.string_dict(
         #     doc = "Additional variables to set on a crate's `rust_library::rustc_env` attribute.",
         # ),
diff --git a/rs/private/BUILD.bazel b/rs/private/BUILD.bazel
@@ -10,7 +10,7 @@ bzl_library(
     name = "all_crate_deps",
     srcs = ["all_crate_deps.bzl"],
     visibility = ["//rs:__subpackages__"],
-    deps = [":rust_deps"],
+    deps = [],
 )
 
 bzl_library(
@@ -67,17 +67,6 @@ bzl_library(
     deps = [":semver"],
 )
 
-bzl_library(
-    name = "rust_deps",
-    srcs = ["rust_deps.bzl"],
-    visibility = ["//rs:__subpackages__"],
-    # keep
-    deps = [
-        "@rules_cc//cc/common",
-        "@rules_rust//rust:bzl_lib",
-    ],
-)
-
 bzl_library(
     name = "toml2json",
     srcs = ["toml2json.bzl"],
diff --git a/rs/private/all_crate_deps.bzl b/rs/private/all_crate_deps.bzl
@@ -1,44 +1,11 @@
-load(":rust_deps.bzl", _rust_deps = "rust_deps")
-
 def _filter_by_prefix(deps, prefix):
     return [dep for dep in deps if dep.startswith(prefix)]
 
-def rust_deps(name, **kwargs):
-    if native.existing_rule(name):
-        fail("""
-ERROR: Multiple conflicting uses of `all_crate_deps`. If you are trying to use this macro with
-the same args in multiple targets, please try the following pattern:
-
-_DEPS = all_crate_deps()
-_PROC_MACRO_DEPS = all_crate_deps(proc_macro = True)
-
-rust_library(
-    name = "my_lib",
-    deps = _DEPS,
-    proc_macro_deps = _PROC_MACRO_DEPS,
-    ...
-)
-
-rust_test(
-    name = "my_test",
-    deps = [":my_lib"]+ _DEPS,
-    proc_macro_deps = _PROC_MACRO_DEPS,
-    ...
-)""")
-
-    _rust_deps(
-        name = name,
-        **kwargs
-    )
-
 def all_crate_deps(
         dep_data,
         normal = False,
         normal_dev = False,
-        proc_macro = False,
-        proc_macro_dev = False,
         build = False,
-        build_proc_macro = False,
         filter_prefix = None):
     to_return = []
 
@@ -52,48 +19,12 @@ def all_crate_deps(
         dev_deps = _filter_by_prefix(dev_deps, filter_prefix)
 
     if normal_dev:
-        rust_deps(
-            name = "_dev_deps",
-            deps = dev_deps,
-        )
-        to_return.append("_dev_deps")
-
-    if proc_macro:
-        rust_deps(
-            name = "_proc_macro_deps",
-            deps = deps,
-            proc_macros = True,
-        )
-        to_return.append("_proc_macro_deps")
-
-    if proc_macro_dev:
-        rust_deps(
-            name = "_proc_macro_dev_deps",
-            deps = dev_deps,
-            proc_macros = True,
-        )
-        to_return.append("_proc_macro_dev_deps")
+        to_return += dev_deps
 
     if build:
-        rust_deps(
-            name = "_build_script_deps",
-            deps = build_deps,
-        )
-        to_return.append("_build_script_deps")
-
-    if build_proc_macro:
-        rust_deps(
-            name = "_build_script_proc_macro_deps",
-            deps = build_deps,
-            proc_macros = True,
-        )
-        to_return.append("_build_script_proc_macro_deps")
+        to_return += build_deps
 
     if normal or not to_return:
-        rust_deps(
-            name = "_deps",
-            deps = deps,
-        )
-        to_return.append("_deps")
+        to_return += deps
 
     return to_return
diff --git a/rs/private/rust_deps.bzl b/rs/private/rust_deps.bzl
diff --git a/rs/rust_crate.bzl b/rs/rust_crate.bzl
@@ -3,7 +3,6 @@ load("//rs:cargo_build_script.bzl", "cargo_build_script")
 load("//rs:rust_binary.bzl", "rust_binary")
 load("//rs:rust_library.bzl", "rust_library")
 load("//rs:rust_proc_macro.bzl", "rust_proc_macro")
-load("//rs/private:rust_deps.bzl", "rust_deps")
 
 def _platform(triple, use_experimental_platforms):
     if use_experimental_platforms:
@@ -105,7 +104,7 @@ def rust_crate(
                 build_script_name = "_bs_" + triple
                 branches[_platform(triple, use_experimental_platforms)] = build_script_name
 
-                _build_script(
+                cargo_build_script(
                     name = build_script_name,
                     crate_features = crate_features + conditional_crate_features.get(triple, []),
                     **build_script_kwargs
@@ -118,7 +117,7 @@ def rust_crate(
             )
 
         else:
-            _build_script(
+            cargo_build_script(
                 name = "_bs",
                 crate_features = crate_features,
                 **build_script_kwargs
@@ -128,18 +127,7 @@ def rust_crate(
     else:
         maybe_build_script = []
 
-    rust_deps(
-        name = name + "_deps",
-        deps = deps,
-    )
-
-    rust_deps(
-        name = name + "_proc_macro_deps",
-        deps = deps,
-        proc_macros = True,
-    )
-
-    deps = [name + "_deps"] + maybe_build_script
+    deps = deps + maybe_build_script
 
     kwargs = dict(
         name = name,
@@ -150,7 +138,6 @@ def rust_crate(
         aliases = aliases,
         deps = deps,
         data = data,
-        proc_macro_deps = [name + "_proc_macro_deps"],
         crate_features = crate_features + select(
             {_platform(k, use_experimental_platforms): v for k, v in conditional_crate_features.items()} |
             {"//conditions:default": []},
@@ -189,24 +176,3 @@ def rust_crate(
             visibility = ["//visibility:public"],
         )
 
-def _build_script(
-        name,
-        build_deps,
-        **kwargs):
-    rust_deps(
-        name = name + "_deps",
-        deps = build_deps,
-    )
-
-    rust_deps(
-        name = name + "_proc_macro_deps",
-        deps = build_deps,
-        proc_macros = True,
-    )
-
-    cargo_build_script(
-        name = name,
-        deps = [name + "_deps"],
-        proc_macro_deps = [name + "_proc_macro_deps"],
-        **kwargs
-    )
diff --git a/test/workspace_hyphen_dep_aliases/consumer/BUILD.bazel b/test/workspace_hyphen_dep_aliases/consumer/BUILD.bazel
@@ -7,5 +7,4 @@ rust_test(
     aliases = aliases(),
     srcs = ["src/lib.rs"],
     deps = all_crate_deps(normal = True),
-    proc_macro_deps = all_crate_deps(proc_macro = True),
 )
diff --git a/test/workspace_hyphen_dep_aliases/dep-crate/BUILD.bazel b/test/workspace_hyphen_dep_aliases/dep-crate/BUILD.bazel
@@ -10,5 +10,4 @@ rust_library(
     edition = "2024",
     aliases = aliases(),
     deps = all_crate_deps(normal = True),
-    proc_macro_deps = all_crate_deps(proc_macro = True),
 )

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,6 @@ rust_library(`
`39`	`39`	`srcs = ["src/lib.rs"],`
`40`	`40`	`aliases = aliases(),`
`41`	`41`	`deps = all_crate_deps(normal = True),`
`42`		`- proc_macro_deps = all_crate_deps(proc_macro = True),`
`43`	`42`	`)`
`44`	`43`
`45`	`44`	`rust_binary(`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,4 @@ rust_test(`
`7`	`7`	`aliases = aliases(),`
`8`	`8`	`srcs = ["src/lib.rs"],`
`9`	`9`	`deps = all_crate_deps(normal = True),`
`10`		`- proc_macro_deps = all_crate_deps(proc_macro = True),`
`11`	`10`	`)`
Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,4 @@ rust_library(`
`10`	`10`	`edition = "2024",`
`11`	`11`	`aliases = aliases(),`
`12`	`12`	`deps = all_crate_deps(normal = True),`
`13`		`- proc_macro_deps = all_crate_deps(proc_macro = True),`
`14`	`13`	`)`