From 4a55fb8246c9bf4959257f6bf02ac6855a33bbac Mon Sep 17 00:00:00 2001
From: David Marcin <david@metawork.com>
Date: Sun, 14 Feb 2021 10:12:20 +0000
Subject: [PATCH] Make buildifier happy

---
 docs/BUILD                     | 19 ++++++++-----------
 docs/all.bzl                   |  4 ++--
 rust/private/rust_analyzer.bzl | 18 +++++++++---------
 rust/rust.bzl                  | 10 +++++-----
 4 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/docs/BUILD b/docs/BUILD
index 7f5c442c27..945d56605b 100644
--- a/docs/BUILD
+++ b/docs/BUILD
@@ -37,12 +37,20 @@ PAGES = {
         "rust_benchmark",
         "rust_test",
     ],
+    "rust_analyzer": [
+        "rust_analyzer",
+        "rust_analyzer_aspect",
+    ],
     "rust_bindgen": [
         "rust_bindgen_library",
         "rust_bindgen_repositories",
         "rust_bindgen_toolchain",
         "rust_bindgen",
     ],
+    "rust_clippy": [
+        "rust_clippy",
+        "rust_clippy_aspect",
+    ],
     "rust_doc": [
         "rust_doc",
         "rust_doc_test",
@@ -60,17 +68,6 @@ PAGES = {
         "rust_toolchain_repository",
         "rust_toolchain_repository_proxy",
     ],
-    "rust_workspace": [
-        "rust_workspace",
-    ],
-    "rust_clippy": [
-        "rust_clippy",
-        "rust_clippy_aspect",
-    ],
-    "rust_analyzer": [
-        "rust_analyzer",
-        "rust_analyzer_aspect",
-    ]
     "rust_wasm_bindgen": [
         "rust_wasm_bindgen_repositories",
         "rust_wasm_bindgen_toolchain",
diff --git a/docs/all.bzl b/docs/all.bzl
index d040112b7e..15b2569988 100644
--- a/docs/all.bzl
+++ b/docs/all.bzl
@@ -38,14 +38,14 @@ load(
 )
 load(
     "@rules_rust//rust:rust.bzl",
+    _rust_analyzer = "rust_analyzer",
     _rust_benchmark = "rust_benchmark",
     _rust_binary = "rust_binary",
+    _rust_clippy = "rust_clippy",
     _rust_doc = "rust_doc",
     _rust_doc_test = "rust_doc_test",
     _rust_library = "rust_library",
     _rust_test = "rust_test",
-    _rust_clippy = "rust_clippy",
-    _rust_analyzer = "rust_analyzer",
 )
 load(
     "@rules_rust//rust:toolchain.bzl",
diff --git a/rust/private/rust_analyzer.bzl b/rust/private/rust_analyzer.bzl
index 42cac4727d..6da3504c87 100644
--- a/rust/private/rust_analyzer.bzl
+++ b/rust/private/rust_analyzer.bzl
@@ -20,10 +20,10 @@ given targets. This file can be consumed by rust-analyzer as an alternative
 to Cargo.toml files.
 """
 
+load("//rust/platform:triple_mappings.bzl", "system_to_dylib_ext", "triple_to_system")
 load("//rust/private:common.bzl", "rust_common")
 load("//rust/private:rustc.bzl", "BuildInfo")
 load("//rust/private:utils.bzl", "find_toolchain")
-load("//rust/platform:triple_mappings.bzl", "system_to_dylib_ext", "triple_to_system")
 
 # We support only these rule kinds.
 _rust_rules = [
@@ -34,13 +34,13 @@ _rust_rules = [
 RustAnalyzerInfo = provider(
     doc = "RustAnalyzerInfo holds rust crate metadata for targets",
     fields = {
+        "build_info": "BuildInfo: build info for this crate if present",
+        "cfgs": "List[String]: features or other compilation --cfg settings",
         "crate": "rust_common.crate_info",
         "deps": "List[RustAnalyzerInfo]: direct dependencies",
-        "transitive_deps": "List[RustAnalyzerInfo]: transitive closure of dependencies",
-        "cfgs": "List[String]: features or other compilation --cfg settings",
         "env": "Dict{String: String}: Environment variables, used for the `env!` macro",
         "proc_macro_dylib_path": "File: compiled shared library output of proc-macro rule",
-        "build_info": "BuildInfo: build info for this crate if present",
+        "transitive_deps": "List[RustAnalyzerInfo]: transitive closure of dependencies",
     },
 )
 
@@ -81,7 +81,7 @@ def _rust_analyzer_aspect_impl(target, ctx):
 
 def find_proc_macro_dylib_path(toolchain, target):
     """Find the proc_macro_dylib_path of target. Returns None if target crate is not type proc-macro.
-    
+
     Args:
         toolchain: The current rust toolchain.
         target: The current target.
@@ -108,11 +108,11 @@ rust_analyzer_aspect = aspect(
     doc = "Annotates rust rules with RustAnalyzerInfo later used to build a rust-project.json",
 )
 
-_exec_root_tmpl = '__EXEC_ROOT__/'
+_exec_root_tmpl = "__EXEC_ROOT__/"
 
 def _crate_id(crate_info):
     """Returns a unique stable identifier for a crate
-    
+
     Returns:
         (string): This crate's unique stable id.
     """
@@ -149,13 +149,13 @@ def create_crate(ctx, info, crate_mapping):
         crate["env"].update({"OUT_DIR": _exec_root_tmpl + info.build_info.out_dir.path})
         crate["source"] = {
             # We have to tell rust-analyzer about our out_dir since it's not under the crate root.
-            "include_dirs": [crate_root, _exec_root_tmpl + info.build_info.out_dir.path],
             "exclude_dirs": [],
+            "include_dirs": [crate_root, _exec_root_tmpl + info.build_info.out_dir.path],
         }
     crate["env"].update(info.env)
 
     deps = [
-        {"name": d.crate.name, "crate": crate_mapping[_crate_id(d.crate)]}
+        {"crate": crate_mapping[_crate_id(d.crate)], "name": d.crate.name}
         for d in info.deps
     ]
     crate["deps"] = deps
diff --git a/rust/rust.bzl b/rust/rust.bzl
index ac6bb7a41b..1562635820 100644
--- a/rust/rust.bzl
+++ b/rust/rust.bzl
@@ -28,6 +28,11 @@ load(
     _rust_test = "rust_test",
     _rust_test_binary = "rust_test_binary",
 )
+load(
+    "//rust/private:rust_analyzer.bzl",
+    _rust_analyzer = "rust_analyzer",
+    _rust_analyzer_aspect = "rust_analyzer_aspect",
+)
 load(
     "//rust/private:rustc.bzl",
     _error_format = "error_format",
@@ -40,11 +45,6 @@ load(
     "//rust/private:rustdoc_test.bzl",
     _rust_doc_test = "rust_doc_test",
 )
-load(
-    "//rust/private:rust_analyzer.bzl",
-    _rust_analyzer = "rust_analyzer",
-    _rust_analyzer_aspect = "rust_analyzer_aspect",
-)
 
 rust_library = _rust_library
 # See @rules_rust//rust/private:rust.bzl for a complete description.