fixes

Author: dzbarsky

crate_universe/BUILD.bazel

@@ -73,7 +73,10 @@ rust_library(
     stamp = -1,
     version = VERSION,
     visibility = ["//visibility:public"],
-    deps = all_crate_deps(normal = True, proc_macro = True),
+    deps = all_crate_deps(
+        normal = True,
+        proc_macro = True,
+    ),
 )
 
 rust_binary(

crate_universe/src/rendering.rs

@@ -590,7 +590,9 @@ impl Renderer {
                             .unwrap_or_default(),
                     ),
                     self.make_deps(
-                        attrs.map(|attrs| attrs.proc_macro_deps.clone()).unwrap_or_default(),
+                        attrs
+                            .map(|attrs| attrs.proc_macro_deps.clone())
+                            .unwrap_or_default(),
                         attrs
                             .map(|attrs| attrs.extra_proc_macro_deps.clone())
                             .unwrap_or_default(),

crate_universe/tools/urls_generator/BUILD.bazel

@@ -17,5 +17,8 @@ rust_binary(
     rustc_env = {
         "MODULE_ROOT_PATH": "$(rootpath //crate_universe/private:urls.bzl)",
     },
-    deps = all_crate_deps(normal = True, proc_macro = True),
+    deps = all_crate_deps(
+        normal = True,
+        proc_macro = True,
+    ),
 )

rust/defs.bzl

@@ -79,7 +79,7 @@ load(
 def _rule_wrapper(rule):
     def _wrapped(name, deps = [], proc_macro_deps = [], **kwargs):
         if proc_macro_deps:
-            print("proc_macros can now be passed directly to `deps`, no need to use `proc_macro_deps` in " + native.package_relative_label(name))
+            print("proc_macros can now be passed directly to `deps`, no need to use `proc_macro_deps` in %s" % native.package_relative_label(name)) # buildifier: disable=print
 
         rule(
             name = name,

rust/private/rust.bzl

@@ -22,8 +22,8 @@ load(
     "AllocatorLibrariesImplInfo",
     "AllocatorLibrariesInfo",
     "BuildInfo",
-    "CrateInfo",
     "CrateGroupInfo",
+    "CrateInfo",
     "DepInfo",
     "LintsInfo",
 )
@@ -1544,6 +1544,8 @@ def rust_test_suite(name, srcs, shared_srcs = [], deps = [], proc_macro_deps = [
         name (str): The name of the `test_suite`.
         srcs (list): All test sources, typically `glob(["tests/**/*.rs"])`.
         shared_srcs (list): Optional argument for sources shared among tests, typically helper functions.
+        deps (list): Deps and proc_macro_deps for underlying test.
+        proc_macro_deps (list): Deprecated; do not use.
         **kwargs (dict): Additional keyword arguments for the underlying [rust_test](#rust_test) targets. The
             `tags` argument is also passed to the generated `test_suite` target.
     """

rust/private/utils.bzl

@@ -498,7 +498,6 @@ def is_exec_configuration(ctx):
     # TODO(djmarcin): Is there any better way to determine cfg=exec?
     return ctx.genfiles_dir.path.find("-exec") != -1
 
-
 def filter_deps(ctx):
     """Filters the provided (combined) deps into normal deps and proc_macro deps.
 

test/rust_analyzer/aspect_traversal_test/BUILD.bazel

@@ -70,8 +70,8 @@ rust_test(
     crate = ":mylib",
     edition = "2018",
     deps = [
+        ":extra_proc_macro_dep",
         ":extra_test_dep",
-        ":extra_proc_macro_dep"
     ],
 )