Use buildifier 6.4.0 for improved load sorting (#2500)

Followup to/depends on #2499 Bigger PR than 2499 due to me not including `.bzl` files. I was using a command from my history that just operated on BUILD/MODULE files. Big enough it might make upstream merges a little painful? I'll leave that thought to the maintainers. **6.3.3:** `out_of_order_load` warning is enabled by default **6.4.0:** More correct sorting order of load statements Could bump to 7.1.2 which is latest, but not necessary for auto fixing of load sorting
bazelbuild · Jul 12, 2024 · 90ec747 · 90ec747
1 parent 6db5fb0
commit 90ec747
Show file tree

Hide file tree

Showing 130 changed files with 930 additions and 927 deletions.
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
@@ -44,4 +44,4 @@ tasks:
     - "doc/..."
     <<: *common_last_green
 
-buildifier: 6.3.2
+buildifier: 6.4.0
diff --git a/apple/apple.bzl b/apple/apple.bzl
@@ -23,19 +23,14 @@ load(
     _apple_dynamic_framework_import = "apple_dynamic_framework_import",
     _apple_static_framework_import = "apple_static_framework_import",
 )
-load(
-    "@build_bazel_rules_apple//apple/internal:apple_xcframework_import.bzl",
-    _apple_dynamic_xcframework_import = "apple_dynamic_xcframework_import",
-    _apple_static_xcframework_import = "apple_static_xcframework_import",
-)
 load(
     "@build_bazel_rules_apple//apple/internal:apple_universal_binary.bzl",
     _apple_universal_binary = "apple_universal_binary",
 )
 load(
-    "@build_bazel_rules_apple//apple/internal:xcframework_rules.bzl",
-    _apple_static_xcframework = "apple_static_xcframework",
-    _apple_xcframework = "apple_xcframework",
+    "@build_bazel_rules_apple//apple/internal:apple_xcframework_import.bzl",
+    _apple_dynamic_xcframework_import = "apple_dynamic_xcframework_import",
+    _apple_static_xcframework_import = "apple_static_xcframework_import",
 )
 load(
     "@build_bazel_rules_apple//apple/internal:experimental_mixed_language_library.bzl",
@@ -47,6 +42,11 @@ load(
     _provisioning_profile_repository = "provisioning_profile_repository",
     _provisioning_profile_repository_extension = "provisioning_profile_repository_extension",
 )
+load(
+    "@build_bazel_rules_apple//apple/internal:xcframework_rules.bzl",
+    _apple_static_xcframework = "apple_static_xcframework",
+    _apple_xcframework = "apple_xcframework",
+)
 
 apple_dynamic_framework_import = _apple_dynamic_framework_import
 apple_dynamic_xcframework_import = _apple_dynamic_xcframework_import

diff --git a/apple/apple_static_library.bzl b/apple/apple_static_library.bzl
@@ -14,6 +14,10 @@
 
 """apple_static_library Starlark implementation"""
 
+load(
+    "@build_bazel_rules_apple//apple:providers.bzl",
+    "ApplePlatformInfo",
+)
 load(
     "@build_bazel_rules_apple//apple/internal:linking_support.bzl",
     "linking_support",
@@ -34,10 +38,6 @@ load(
     "@build_bazel_rules_apple//apple/internal:transition_support.bzl",
     "transition_support",
 )
-load(
-    "@build_bazel_rules_apple//apple:providers.bzl",
-    "ApplePlatformInfo",
-)
 
 def _apple_static_library_impl(ctx):
     if ctx.attr.platform_type == "visionos":

diff --git a/apple/cc_toolchain_forwarder.bzl b/apple/cc_toolchain_forwarder.bzl
@@ -16,9 +16,9 @@
 A rule for handling the cc_toolchains and their constraints for a potential "fat" Mach-O binary.
 """
 
-load("//apple/internal:providers.bzl", "new_appleplatforminfo")
-load("//apple:providers.bzl", "ApplePlatformInfo")
 load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain", "use_cpp_toolchain")
+load("//apple:providers.bzl", "ApplePlatformInfo")
+load("//apple/internal:providers.bzl", "new_appleplatforminfo")
 
 def _target_os_from_rule_ctx(ctx):
     """Returns a `String` representing the selected Apple OS."""

diff --git a/apple/dtrace.bzl b/apple/dtrace.bzl
@@ -14,14 +14,6 @@
 
 """# Bazel rules for working with dtrace."""
 
-load(
-    "@build_bazel_apple_support//lib:apple_support.bzl",
-    "apple_support",
-)
-load(
-    "@build_bazel_rules_apple//apple/internal/utils:bundle_paths.bzl",
-    "bundle_paths",
-)
 load(
     "@bazel_skylib//lib:dicts.bzl",
     "dicts",
@@ -30,6 +22,14 @@ load(
     "@bazel_skylib//lib:paths.bzl",
     "paths",
 )
+load(
+    "@build_bazel_apple_support//lib:apple_support.bzl",
+    "apple_support",
+)
+load(
+    "@build_bazel_rules_apple//apple/internal/utils:bundle_paths.bzl",
+    "bundle_paths",
+)
 
 def _dtrace_compile_impl(ctx):
     """Implementation for dtrace_compile."""

diff --git a/apple/internal/apple_framework_import.bzl b/apple/internal/apple_framework_import.bzl
@@ -30,13 +30,14 @@ load(
     "@bazel_skylib//lib:sets.bzl",
     "sets",
 )
+load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain", "use_cpp_toolchain")
 load(
     "@build_bazel_rules_apple//apple:providers.bzl",
     "AppleFrameworkImportInfo",
 )
 load(
-    "@build_bazel_rules_apple//apple/internal/providers:framework_import_bundle_info.bzl",
-    "AppleFrameworkImportBundleInfo",
+    "@build_bazel_rules_apple//apple:utils.bzl",
+    "group_files_by_directory",
 )
 load(
     "@build_bazel_rules_apple//apple/internal:apple_toolchains.bzl",
@@ -46,37 +47,36 @@ load(
     "@build_bazel_rules_apple//apple/internal:cc_toolchain_info_support.bzl",
     "cc_toolchain_info_support",
 )
-load(
-    "@build_bazel_rules_apple//apple/internal/utils:bundle_paths.bzl",
-    "bundle_paths",
-)
 load(
     "@build_bazel_rules_apple//apple/internal:experimental.bzl",
     "is_experimental_tree_artifact_enabled",
 )
 load(
-    "@build_bazel_rules_apple//apple/internal/aspects:swift_usage_aspect.bzl",
-    "SwiftUsageInfo",
+    "@build_bazel_rules_apple//apple/internal:framework_import_support.bzl",
+    "framework_import_support",
 )
 load(
     "@build_bazel_rules_apple//apple/internal:rule_attrs.bzl",
     "rule_attrs",
 )
 load(
-    "@build_bazel_rules_apple//apple:utils.bzl",
-    "group_files_by_directory",
+    "@build_bazel_rules_apple//apple/internal/aspects:swift_usage_aspect.bzl",
+    "SwiftUsageInfo",
+)
+load(
+    "@build_bazel_rules_apple//apple/internal/providers:framework_import_bundle_info.bzl",
+    "AppleFrameworkImportBundleInfo",
+)
+load(
+    "@build_bazel_rules_apple//apple/internal/utils:bundle_paths.bzl",
+    "bundle_paths",
 )
 load(
     "@build_bazel_rules_swift//swift:swift.bzl",
     "SwiftToolchainInfo",
     "swift_clang_module_aspect",
     "swift_common",
 )
-load(
-    "@build_bazel_rules_apple//apple/internal:framework_import_support.bzl",
-    "framework_import_support",
-)
-load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain", "use_cpp_toolchain")
 
 def _swiftmodule_for_cpu(swiftmodule_files, cpu):
     """Select the cpu specific swiftmodule."""

diff --git a/apple/internal/apple_universal_binary.bzl b/apple/internal/apple_universal_binary.bzl
@@ -14,14 +14,6 @@
 
 """Implementation for apple universal binary rules."""
 
-load(
-    "@build_bazel_rules_apple//apple/internal:rule_attrs.bzl",
-    "rule_attrs",
-)
-load(
-    "@build_bazel_rules_apple//apple/internal:rule_factory.bzl",
-    "rule_factory",
-)
 load(
     "@build_bazel_rules_apple//apple/internal:linking_support.bzl",
     "linking_support",
@@ -30,6 +22,14 @@ load(
     "@build_bazel_rules_apple//apple/internal:providers.bzl",
     "new_applebinaryinfo",
 )
+load(
+    "@build_bazel_rules_apple//apple/internal:rule_attrs.bzl",
+    "rule_attrs",
+)
+load(
+    "@build_bazel_rules_apple//apple/internal:rule_factory.bzl",
+    "rule_factory",
+)
 load(
     "@build_bazel_rules_apple//apple/internal:transition_support.bzl",
     "transition_support",

diff --git a/apple/internal/apple_xcframework_import.bzl b/apple/internal/apple_xcframework_import.bzl
@@ -14,6 +14,9 @@
 
 """Implementation of XCFramework import rules."""
 
+load("@bazel_skylib//lib:dicts.bzl", "dicts")
+load("@bazel_skylib//lib:paths.bzl", "paths")
+load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain", "use_cpp_toolchain")
 load("@build_bazel_apple_support//lib:apple_support.bzl", "apple_support")
 load(
     "@build_bazel_rules_apple//apple/internal:apple_toolchains.bzl",
@@ -32,21 +35,18 @@ load(
     "@build_bazel_rules_apple//apple/internal:framework_import_support.bzl",
     "framework_import_support",
 )
-load("//apple/internal:intermediates.bzl", "intermediates")
-load("//apple/internal:rule_attrs.bzl", "rule_attrs")
 load(
     "@build_bazel_rules_apple//apple/internal/aspects:swift_usage_aspect.bzl",
     "SwiftUsageInfo",
 )
-load("//apple:providers.bzl", "AppleFrameworkImportInfo")
 load(
     "@build_bazel_rules_apple//apple/internal/providers:framework_import_bundle_info.bzl",
     "AppleFrameworkImportBundleInfo",
 )
 load("@build_bazel_rules_swift//swift:swift.bzl", "SwiftToolchainInfo", "swift_clang_module_aspect", "swift_common")
-load("@bazel_skylib//lib:dicts.bzl", "dicts")
-load("@bazel_skylib//lib:paths.bzl", "paths")
-load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain", "use_cpp_toolchain")
+load("//apple:providers.bzl", "AppleFrameworkImportInfo")
+load("//apple/internal:intermediates.bzl", "intermediates")
+load("//apple/internal:rule_attrs.bzl", "rule_attrs")
 
 # Currently, XCFramework bundles can contain Apple frameworks or libraries.
 # This defines an _enum_ to identify an imported XCFramework bundle type.

diff --git a/apple/internal/aspects/app_intents_aspect.bzl b/apple/internal/aspects/app_intents_aspect.bzl
@@ -22,11 +22,6 @@ load(
     "@build_bazel_apple_support//lib:apple_support.bzl",
     "apple_support",
 )
-load("//apple/internal:cc_info_support.bzl", "cc_info_support")
-load(
-    "//apple/internal/providers:app_intents_info.bzl",
-    "AppIntentsInfo",
-)
 load(
     "@build_bazel_rules_swift//swift:module_name.bzl",
     "derive_swift_module_name",
@@ -35,6 +30,11 @@ load(
     "@build_bazel_rules_swift//swift:swift.bzl",
     "SwiftInfo",
 )
+load("//apple/internal:cc_info_support.bzl", "cc_info_support")
+load(
+    "//apple/internal/providers:app_intents_info.bzl",
+    "AppIntentsInfo",
+)
 
 def _app_intents_aspect_impl(target, ctx):
     """Implementation of the swift source files propation aspect."""

diff --git a/apple/internal/aspects/resource_aspect.bzl b/apple/internal/aspects/resource_aspect.bzl
@@ -14,13 +14,23 @@
 
 """Implementation of the resource propagation aspect."""
 
+load(
+    "@bazel_skylib//lib:dicts.bzl",
+    "dicts",
+)
+load(
+    "@bazel_skylib//lib:partial.bzl",
+    "partial",
+)
 load(
     "@build_bazel_apple_support//lib:apple_support.bzl",
     "apple_support",
 )
 load(
-    "@build_bazel_rules_apple//apple/internal/providers:apple_debug_info.bzl",
-    "AppleDebugInfo",
+    "@build_bazel_rules_apple//apple:providers.bzl",
+    "AppleDsymBundleInfo",
+    "AppleFrameworkBundleInfo",
+    "AppleResourceInfo",
 )
 load(
     "@build_bazel_rules_apple//apple/internal:apple_toolchains.bzl",
@@ -49,10 +59,8 @@ load(
     "swift_support",
 )
 load(
-    "@build_bazel_rules_apple//apple:providers.bzl",
-    "AppleDsymBundleInfo",
-    "AppleFrameworkBundleInfo",
-    "AppleResourceInfo",
+    "@build_bazel_rules_apple//apple/internal/providers:apple_debug_info.bzl",
+    "AppleDebugInfo",
 )
 load(
     "@build_bazel_rules_apple//apple/internal/providers:framework_import_bundle_info.bzl",
@@ -62,14 +70,6 @@ load(
     "@build_bazel_rules_swift//swift:swift.bzl",
     "SwiftInfo",
 )
-load(
-    "@bazel_skylib//lib:dicts.bzl",
-    "dicts",
-)
-load(
-    "@bazel_skylib//lib:partial.bzl",
-    "partial",
-)
 
 def _platform_prerequisites_for_aspect(target, aspect_ctx):
     """Return the set of platform prerequisites that can be determined from this aspect."""

diff --git a/apple/internal/codesigning_support.bzl b/apple/internal/codesigning_support.bzl
@@ -15,12 +15,16 @@
 """Actions related to codesigning."""
 
 load(
-    "@build_bazel_apple_support//lib:apple_support.bzl",
-    "apple_support",
+    "@bazel_skylib//lib:paths.bzl",
+    "paths",
 )
 load(
-    "@build_bazel_rules_apple//apple/internal/utils:defines.bzl",
-    "defines",
+    "@bazel_skylib//lib:shell.bzl",
+    "shell",
+)
+load(
+    "@build_bazel_apple_support//lib:apple_support.bzl",
+    "apple_support",
 )
 load(
     "@build_bazel_rules_apple//apple/internal:intermediates.bzl",
@@ -31,12 +35,8 @@ load(
     "rule_support",
 )
 load(
-    "@bazel_skylib//lib:paths.bzl",
-    "paths",
-)
-load(
-    "@bazel_skylib//lib:shell.bzl",
-    "shell",
+    "@build_bazel_rules_apple//apple/internal/utils:defines.bzl",
+    "defines",
 )
 
 # The adhoc signature used as an identity, partially documented at https://developer.apple.com/documentation/security/seccodesignatureflags/1397793-adhoc

diff --git a/apple/internal/docc.bzl b/apple/internal/docc.bzl
@@ -14,14 +14,14 @@
 
 """Defines rules for building Apple DocC targets."""
 
-load(
-    "@build_bazel_apple_support//lib:apple_support.bzl",
-    "apple_support",
-)
 load(
     "@bazel_skylib//lib:dicts.bzl",
     "dicts",
 )
+load(
+    "@build_bazel_apple_support//lib:apple_support.bzl",
+    "apple_support",
+)
 load(
     "@build_bazel_rules_apple//apple:providers.bzl",
     "DocCBundleInfo",

diff --git a/apple/internal/entitlements_support.bzl b/apple/internal/entitlements_support.bzl
@@ -19,8 +19,8 @@ load(
     "apple_support",
 )
 load(
-    "@build_bazel_rules_apple//apple/internal/utils:defines.bzl",
-    "defines",
+    "@build_bazel_rules_apple//apple:common.bzl",
+    "entitlements_validation_mode",
 )
 load(
     "@build_bazel_rules_apple//apple/internal:apple_product_type.bzl",
@@ -35,8 +35,8 @@ load(
     "resource_actions",
 )
 load(
-    "@build_bazel_rules_apple//apple:common.bzl",
-    "entitlements_validation_mode",
+    "@build_bazel_rules_apple//apple/internal/utils:defines.bzl",
+    "defines",
 )
 
 def _tool_validation_mode(*, is_device, rules_mode):