Review tweaks

* Update to use defs.bzl * Fix up some tests * Remove pseudo-attempt at bootstrapping
bazelbuild · Mar 24, 2021 · 10ac0f8 · 10ac0f8
1 parent 09272cc
commit 10ac0f8
Show file tree

Hide file tree

Showing 10 changed files with 127 additions and 98 deletions.
diff --git a/cargo/crate_universe_resolver/src/templates/crate.BUILD.template b/cargo/crate_universe_resolver/src/templates/crate.BUILD.template
@@ -1,8 +1,9 @@
 # buildifier: disable=load
 load(
-    "@rules_rust//rust:rust.bzl",
+    "@rules_rust//rust:defs.bzl",
     "rust_binary",
     "rust_library",
+    "rust_proc_macro",
     "rust_test",
 )
 

diff --git a/cargo/crate_universe_resolver/src/templates/partials/rust_library.template b/cargo/crate_universe_resolver/src/templates/partials/rust_library.template
@@ -11,9 +11,12 @@ alias(
 
 {% endif -%}
 # buildifier: leave-alone
+{%- if target.kind == "proc-macro" %}
+rust_proc_macro(
+{%- else %}
 rust_library(
+{%- endif %}
     name = "{{ target_name_sanitized }}",
-    crate_type = "{{ target.kind }}",
     deps = [
         {%- if crate.build_script_target %}
         ":{{ crate_name_sanitized }}_build_script",