Google-internal change.

PiperOrigin-RevId: 549579364
Change-Id: I4116061a4041e6947a38ea80037f79473a2aaa63
diff --git a/cc_bindings_from_rs/test/functions/BUILD b/cc_bindings_from_rs/test/functions/BUILD
index 827140e..f9a2a3a 100644
--- a/cc_bindings_from_rs/test/functions/BUILD
+++ b/cc_bindings_from_rs/test/functions/BUILD
@@ -33,7 +33,7 @@
     srcs = ["functions_test.cc"],
     deps = [
         ":functions_cc_api",
-        "@com_google_googletest//:gtest_main",
         "//support/rs_std:rs_char",
+        "@com_google_googletest//:gtest_main",
     ],
 )
diff --git a/common/test/bidirectional_deps/BUILD b/common/test/bidirectional_deps/BUILD
index 507aaaf..b0a66de 100644
--- a/common/test/bidirectional_deps/BUILD
+++ b/common/test/bidirectional_deps/BUILD
@@ -55,7 +55,7 @@
     srcs = ["cc_test.cc"],
     deps = [
         ":leaf_cc_lib",
-        "@com_google_googletest//:gtest_main",
         "//common:rust_allocator_shims",
+        "@com_google_googletest//:gtest_main",
     ],
 )
diff --git a/lifetime_analysis/BUILD b/lifetime_analysis/BUILD
index 54e8b0a..a8b41bb 100644
--- a/lifetime_analysis/BUILD
+++ b/lifetime_analysis/BUILD
@@ -15,12 +15,12 @@
         ":object_set",
         ":points_to_map",
         ":template_placeholder_support",
-        "@absl//absl/strings",
-        "@absl//absl/strings:str_format",
         "//lifetime_annotations",
         "//lifetime_annotations:lifetime",
         "//lifetime_annotations:lifetime_substitutions",
         "//lifetime_annotations:type_lifetimes",
+        "@absl//absl/strings",
+        "@absl//absl/strings:str_format",
         "@llvm-project//clang:analysis",
         "@llvm-project//clang:ast",
         "@llvm-project//clang:ast_matchers",
@@ -117,10 +117,10 @@
     srcs = ["object.cc"],
     hdrs = ["object.h"],
     deps = [
-        "@absl//absl/strings",
-        "@absl//absl/strings:str_format",
         "//lifetime_annotations:lifetime",
         "//lifetime_annotations:type_lifetimes",
+        "@absl//absl/strings",
+        "@absl//absl/strings:str_format",
         "@llvm-project//clang:ast",
     ],
 )
@@ -142,10 +142,10 @@
     deps = [
         ":object",
         ":object_set",
-        "@com_google_googletest//:gtest_main",
         "//lifetime_annotations",
         "//lifetime_annotations:lifetime",
         "//lifetime_annotations/test:run_on_code",
+        "@com_google_googletest//:gtest_main",
         "@llvm-project//clang:ast",
     ],
 )
@@ -157,9 +157,9 @@
     deps = [
         ":object",
         ":object_set",
+        "//lifetime_annotations:lifetime",
         "@absl//absl/strings",
         "@absl//absl/strings:str_format",
-        "//lifetime_annotations:lifetime",
         "@llvm-project//clang:ast",
         "@llvm-project//clang:basic",
         "@llvm-project//llvm:Support",
@@ -173,10 +173,10 @@
         ":object",
         ":object_set",
         ":points_to_map",
-        "@com_google_googletest//:gtest_main",
         "//lifetime_annotations",
         "//lifetime_annotations:lifetime",
         "//lifetime_annotations/test:run_on_code",
+        "@com_google_googletest//:gtest_main",
         "@llvm-project//clang:ast",
         "@llvm-project//clang:ast_matchers",
     ],
@@ -191,10 +191,10 @@
         ":object",
         ":object_set",
         ":points_to_map",
-        "@absl//absl/strings",
         "//lifetime_annotations:lifetime",
         "//lifetime_annotations:pointee_type",
         "//lifetime_annotations:type_lifetimes",
+        "@absl//absl/strings",
         "@llvm-project//clang:ast",
         "@llvm-project//clang:basic",
         "@llvm-project//llvm:Support",
@@ -217,9 +217,9 @@
     srcs = ["pointer_compatibility_test.cc"],
     deps = [
         ":pointer_compatibility",
-        "@com_google_googletest//:gtest_main",
         "//lifetime_annotations",
         "//lifetime_annotations/test:run_on_code",
+        "@com_google_googletest//:gtest_main",
         "@llvm-project//clang:ast",
         "@llvm-project//clang:ast_matchers",
         "@llvm-project//llvm:Support",
diff --git a/lifetime_analysis/test/BUILD b/lifetime_analysis/test/BUILD
index 8557d7f..d4b24a1 100644
--- a/lifetime_analysis/test/BUILD
+++ b/lifetime_analysis/test/BUILD
@@ -13,7 +13,7 @@
         "//lifetime_annotations/test:run_on_code",
         "@absl//absl/container:flat_hash_map",
         "@com_google_googletest//:gtest",
-        ],
+    ],
 )
 
 cc_test(
diff --git a/lifetime_annotations/BUILD b/lifetime_annotations/BUILD
index 58a6eb6..4fbea53 100644
--- a/lifetime_annotations/BUILD
+++ b/lifetime_annotations/BUILD
@@ -79,14 +79,14 @@
         ":lifetime_error",
         ":lifetime_symbol_table",
         ":type_lifetimes",
-        "@com_google_googletest//:gtest_main",
+        "//common:status_test_matchers",
+        "//lifetime_annotations/test:named_func_lifetimes",
+        "//lifetime_annotations/test:run_on_code",
         "@absl//absl/status",
         "@absl//absl/status:statusor",
         "@absl//absl/strings",
         "@absl//absl/strings:str_format",
-        "//common:status_test_matchers",
-        "//lifetime_annotations/test:named_func_lifetimes",
-        "//lifetime_annotations/test:run_on_code",
+        "@com_google_googletest//:gtest_main",
         "@llvm-project//clang:ast",
         "@llvm-project//clang:ast_matchers",
         "@llvm-project//clang:tooling",
diff --git a/lifetime_annotations/test/BUILD b/lifetime_annotations/test/BUILD
index 0a861be..2e0019a 100644
--- a/lifetime_annotations/test/BUILD
+++ b/lifetime_annotations/test/BUILD
@@ -11,9 +11,9 @@
     srcs = ["named_func_lifetimes.cc"],
     hdrs = ["named_func_lifetimes.h"],
     deps = [
-        "@com_google_googletest//:gtest",
         "//lifetime_annotations:lifetime_symbol_table",
         "//lifetime_annotations:type_lifetimes",
+        "@com_google_googletest//:gtest",
         "@llvm-project//llvm:Support",
     ],
 )
diff --git a/migrator/rs_from_cc/BUILD b/migrator/rs_from_cc/BUILD
index 776411a..e7fc6e5 100644
--- a/migrator/rs_from_cc/BUILD
+++ b/migrator/rs_from_cc/BUILD
@@ -8,15 +8,15 @@
     visibility = ["//visibility:public"],
     deps = [
         ":rs_from_cc_lib",
+        "//common:file_io",
+        "//common:rust_allocator_shims",
         "@absl//absl/flags:flag",
         "@absl//absl/flags:parse",
         "@absl//absl/log:check",
         "@absl//absl/status",
         "@absl//absl/status:statusor",
         "@absl//absl/strings",
-        "//common:file_io",
         "@llvm-project//llvm:Support",
-        "//common:rust_allocator_shims",
     ],
 )
 
@@ -50,16 +50,16 @@
     srcs = ["converter.cc"],
     hdrs = ["converter.h"],
     deps = [
+        "//lifetime_annotations",
+        "//third_party/re2",
         "@absl//absl/container:flat_hash_map",
         "@absl//absl/container:flat_hash_set",
         "@absl//absl/status:statusor",
         "@absl//absl/strings",
         "@absl//absl/types:span",
-        "//lifetime_annotations",
         "@llvm-project//clang:ast",
         "@llvm-project//clang:basic",
         "@llvm-project//clang:sema",
-        "//third_party/re2",
     ],
 )
 
@@ -68,10 +68,10 @@
     srcs = ["rs_from_cc_lib_test.cc"],
     deps = [
         ":rs_from_cc_lib",
-        "@com_google_googletest//:gtest_main",
+        "//common:status_test_matchers",
         "@absl//absl/status",
         "@absl//absl/strings",
-        "//common:status_test_matchers",
+        "@com_google_googletest//:gtest_main",
         "@llvm-project//clang:ast",
     ],
 )
diff --git a/nullability/test/BUILD b/nullability/test/BUILD
index d8aab60..2be9a0f 100644
--- a/nullability/test/BUILD
+++ b/nullability/test/BUILD
@@ -35,11 +35,11 @@
     testonly = 1,
     srcs = ["nullability_test.cc"],
     deps = [
-        "@absl//absl/log:check",
         "//nullability:pointer_nullability",
         "//nullability:pointer_nullability_analysis",
         "//nullability:pointer_nullability_lattice",
         "//nullability:type_nullability",
+        "@absl//absl/log:check",
         "@llvm-project//clang:analysis",
         "@llvm-project//clang:ast",
         "@llvm-project//clang:basic",
diff --git a/rs_bindings_from_cc/importers/BUILD b/rs_bindings_from_cc/importers/BUILD
index d3cb845..1e9b007 100644
--- a/rs_bindings_from_cc/importers/BUILD
+++ b/rs_bindings_from_cc/importers/BUILD
@@ -21,6 +21,11 @@
     srcs = ["cxx_record.cc"],
     hdrs = ["cxx_record.h"],
     deps = [
+        "//lifetime_annotations:type_lifetimes",
+        "//rs_bindings_from_cc:ast_convert",
+        "//rs_bindings_from_cc:bazel_types",
+        "//rs_bindings_from_cc:cc_ir",
+        "//rs_bindings_from_cc:decl_importer",
         "@absl//absl/container:flat_hash_set",
         "@absl//absl/log",
         "@absl//absl/log:check",
@@ -28,11 +33,6 @@
         "@absl//absl/status",
         "@absl//absl/strings",
         "@absl//absl/strings:string_view",
-        "//lifetime_annotations:type_lifetimes",
-        "//rs_bindings_from_cc:ast_convert",
-        "//rs_bindings_from_cc:bazel_types",
-        "//rs_bindings_from_cc:cc_ir",
-        "//rs_bindings_from_cc:decl_importer",
         "@llvm-project//clang:ast",
         "@llvm-project//clang:basic",
         "@llvm-project//clang:sema",
@@ -45,12 +45,12 @@
     srcs = ["enum.cc"],
     hdrs = ["enum.h"],
     deps = [
-        "@absl//absl/algorithm:container",
-        "@absl//absl/status:statusor",
-        "@absl//absl/strings",
         "//lifetime_annotations:type_lifetimes",
         "//rs_bindings_from_cc:cc_ir",
         "//rs_bindings_from_cc:decl_importer",
+        "@absl//absl/algorithm:container",
+        "@absl//absl/status:statusor",
+        "@absl//absl/strings",
         "@llvm-project//clang:ast",
     ],
 )
@@ -60,9 +60,9 @@
     srcs = ["friend.cc"],
     hdrs = ["friend.h"],
     deps = [
-        "@absl//absl/log:check",
         "//rs_bindings_from_cc:cc_ir",
         "//rs_bindings_from_cc:decl_importer",
+        "@absl//absl/log:check",
         "@llvm-project//clang:ast",
         "@llvm-project//clang:basic",
     ],
@@ -73,9 +73,6 @@
     srcs = ["function.cc"],
     hdrs = ["function.h"],
     deps = [
-        "@absl//absl/log:check",
-        "@absl//absl/status:statusor",
-        "@absl//absl/strings",
         "//lifetime_annotations",
         "//lifetime_annotations:lifetime",
         "//lifetime_annotations:lifetime_error",
@@ -85,6 +82,9 @@
         "//rs_bindings_from_cc:bazel_types",
         "//rs_bindings_from_cc:cc_ir",
         "//rs_bindings_from_cc:decl_importer",
+        "@absl//absl/log:check",
+        "@absl//absl/status:statusor",
+        "@absl//absl/strings",
         "@llvm-project//clang:ast",
         "@llvm-project//clang:basic",
         "@llvm-project//clang:sema",
@@ -108,10 +108,10 @@
     srcs = ["namespace.cc"],
     hdrs = ["namespace.h"],
     deps = [
-        "@absl//absl/log:check",
-        "@absl//absl/strings",
         "//rs_bindings_from_cc:cc_ir",
         "//rs_bindings_from_cc:decl_importer",
+        "@absl//absl/log:check",
+        "@absl//absl/strings",
         "@llvm-project//clang:ast",
     ],
 )
@@ -121,11 +121,11 @@
     srcs = ["type_alias.cc"],
     hdrs = ["type_alias.h"],
     deps = [
-        "@absl//absl/log:check",
-        "@absl//absl/strings",
         "//lifetime_annotations:type_lifetimes",
         "//rs_bindings_from_cc:cc_ir",
         "//rs_bindings_from_cc:decl_importer",
+        "@absl//absl/log:check",
+        "@absl//absl/strings",
         "@llvm-project//clang:ast",
         "@llvm-project//clang:basic",
     ],
@@ -136,12 +136,12 @@
     srcs = ["type_map_override.cc"],
     hdrs = ["type_map_override.h"],
     deps = [
-        "@absl//absl/status",
-        "@absl//absl/status:statusor",
-        "@absl//absl/strings",
         "//common:status_macros",
         "//rs_bindings_from_cc:cc_ir",
         "//rs_bindings_from_cc:decl_importer",
+        "@absl//absl/status",
+        "@absl//absl/status:statusor",
+        "@absl//absl/strings",
         "@llvm-project//clang:ast",
         "@llvm-project//clang:basic",
         "@llvm-project//llvm:Support",
diff --git a/support/cc_import/BUILD b/support/cc_import/BUILD
index e27513e..da1ea06 100644
--- a/support/cc_import/BUILD
+++ b/support/cc_import/BUILD
@@ -29,11 +29,11 @@
     ],
     deps = [
         ":merged_namespaces",
-        "@rules_rust//util/import:import_internal",
         "@crate_index//:proc-macro2",
         "@crate_index//:quote",
         "@crate_index//:serde_json",
         "@crate_index//:syn",
+        "@rules_rust//util/import:import_internal",
     ],
 )
 
@@ -41,12 +41,12 @@
     name = "merged_namespaces",
     srcs = ["merged_namespaces.rs"],
     deps = [
-        "@rules_rust//util/import:import_internal",
         "@crate_index//:proc-macro2",
         "@crate_index//:quote",
         "@crate_index//:serde",
         "@crate_index//:serde_json",
         "@crate_index//:syn",
+        "@rules_rust//util/import:import_internal",
     ],
 )
 
diff --git a/support/rs_std/BUILD b/support/rs_std/BUILD
index 36fd74b..14f29fc 100644
--- a/support/rs_std/BUILD
+++ b/support/rs_std/BUILD
@@ -17,8 +17,8 @@
     # of Abseil that is relatively recent (although we can't rely on an
     # exact version and/or exact absl/base/options.h).
     deps = [
-        "@absl//absl/base:core_headers",
         "//support/internal:bindings_support",
+        "@absl//absl/base:core_headers",
     ],
 )