Reorder build rules in strings/BUILD.gn to match bazel

As a preparation for generating this BUILD.gn file automatically and
thus make it clearer how automated BUILD.gn differ from current version

Bug: 524565513
Change-Id: Iecfb005531cea347bc4b835563d59c682815f8a0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7957925
Commit-Queue: Mirko Bonadei <mbonadei@chromium.org>
Reviewed-by: Mirko Bonadei <mbonadei@chromium.org>
Auto-Submit: Danil Chapovalov <danilchap@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1650847}
NOKEYCHECK=True
GitOrigin-RevId: 0199ac62cd8c4465453441abc94f5a80aff9ff11

absl/strings/BUILD.gn

diff --git a/absl/strings/BUILD.gn b/absl/strings/BUILD.gn
index 0df0410..422ae7a 100644
--- a/absl/strings/BUILD.gn
+++ b/absl/strings/BUILD.gn
@@ -147,133 +147,74 @@
   ]
 }
 
-absl_source_set("str_format") {
-  public = [ "str_format.h" ]
+absl_test("match_test") {
+  sources = [ "match_test.cc" ]
+  deps = [ ":strings" ]
+}
+
+absl_test("has_absl_stringify_test") {
+  sources = [ "has_absl_stringify_test.cc" ]
+  deps = [ ":strings" ]
+}
+
+absl_source_set("has_ostream_operator") {
+  public = [ "has_ostream_operator.h" ]
+  deps = [ "//third_party/abseil-cpp/absl/base:config" ]
+}
+
+absl_test("has_ostream_operator_test") {
+  sources = [ "has_ostream_operator_test.cc" ]
+  deps = [ ":has_ostream_operator" ]
+}
+
+absl_test("ascii_test") {
+  sources = [ "ascii_test.cc" ]
   deps = [
-    ":str_format_internal",
-    ":string_view",
-    "//third_party/abseil-cpp/absl/base:config",
+    ":strings",
     "//third_party/abseil-cpp/absl/base:core_headers",
-    "//third_party/abseil-cpp/absl/base:nullability",
-    "//third_party/abseil-cpp/absl/types:span",
   ]
 }
 
-absl_source_set("str_format_internal") {
-  sources = [
-    "internal/str_format/arg.cc",
-    "internal/str_format/bind.cc",
-    "internal/str_format/extension.cc",
-    "internal/str_format/float_conversion.cc",
-    "internal/str_format/output.cc",
-    "internal/str_format/parser.cc",
-  ]
-  public = [
-    "internal/str_format/arg.h",
-    "internal/str_format/bind.h",
-    "internal/str_format/checker.h",
-    "internal/str_format/constexpr_parser.h",
-    "internal/str_format/extension.h",
-    "internal/str_format/float_conversion.h",
-    "internal/str_format/output.h",
-    "internal/str_format/parser.h",
-  ]
-  visibility = [ ":*" ]
+absl_test("damerau_levenshtein_distance_test") {
+  sources = [ "internal/damerau_levenshtein_distance_test.cc" ]
+  deps = [ ":strings" ]
+}
+
+absl_test("string_constant_test") {
+  sources = [ "internal/string_constant_test.cc" ]
+  deps = [ ":strings" ]
+}
+
+absl_test("string_view_test") {
+  sources = [ "string_view_test.cc" ]
   deps = [
-    ":internal",
     ":string_view",
-    ":strings",
     "//third_party/abseil-cpp/absl/base:config",
     "//third_party/abseil-cpp/absl/base:core_headers",
-    "//third_party/abseil-cpp/absl/container:fixed_array",
-    "//third_party/abseil-cpp/absl/container:inlined_vector",
-    "//third_party/abseil-cpp/absl/functional:function_ref",
+    "//third_party/abseil-cpp/absl/base:dynamic_annotations",
     "//third_party/abseil-cpp/absl/meta:type_traits",
-    "//third_party/abseil-cpp/absl/numeric:bits",
-    "//third_party/abseil-cpp/absl/numeric:int128",
-    "//third_party/abseil-cpp/absl/numeric:representation",
-    "//third_party/abseil-cpp/absl/types:optional",
-    "//third_party/abseil-cpp/absl/types:span",
-    "//third_party/abseil-cpp/absl/utility",
   ]
 }
 
-absl_test("str_format_test") {
-  sources = [ "str_format_test.cc" ]
-  deps = [
-    ":cord",
-    ":str_format",
-    ":strings",
-    "//third_party/abseil-cpp/absl/base:config",
-    "//third_party/abseil-cpp/absl/base:core_headers",
-    "//third_party/abseil-cpp/absl/types:span",
+absl_source_set("stringify_stream") {
+  public = [ "internal/stringify_stream.h" ]
+  visibility = [
+    ":*",
+    "//third_party/abseil-cpp/absl/status:*",
   ]
-}
-
-absl_test("str_format_extension_test") {
-  sources = [ "internal/str_format/extension_test.cc" ]
   deps = [
-    ":str_format",
-    ":str_format_internal",
-    ":strings",
-    "//third_party/abseil-cpp/absl/random",
-  ]
-}
-
-absl_test("str_format_arg_test") {
-  sources = [ "internal/str_format/arg_test.cc" ]
-  deps = [
-    ":str_format",
-    ":str_format_internal",
-    "//third_party/abseil-cpp/absl/base:config",
-  ]
-}
-
-absl_test("str_format_bind_test") {
-  sources = [ "internal/str_format/bind_test.cc" ]
-  deps = [ ":str_format_internal" ]
-}
-
-absl_test("str_format_checker_test") {
-  sources = [ "internal/str_format/checker_test.cc" ]
-  deps = [ ":str_format" ]
-}
-
-absl_test("str_format_convert_test") {
-  if (is_fuchsia) {
-    # This test fails to compile on fuchsia x64 bot
-    sources = []
-  } else {
-    sources = [ "internal/str_format/convert_test.cc" ]
-  }
-  deps = [
-    ":str_format",
-    ":str_format_internal",
-    ":strings",
-    "//third_party/abseil-cpp/absl/base:config",
-    "//third_party/abseil-cpp/absl/base:core_headers",
-    "//third_party/abseil-cpp/absl/base:raw_logging_internal",
-    "//third_party/abseil-cpp/absl/log",
-    "//third_party/abseil-cpp/absl/numeric:int128",
-    "//third_party/abseil-cpp/absl/types:span",
-  ]
-}
-
-absl_test("str_format_output_test") {
-  sources = [ "internal/str_format/output_test.cc" ]
-  deps = [
-    ":cord",
-    ":str_format_internal",
-  ]
-}
-
-absl_test("str_format_parser_test") {
-  sources = [ "internal/str_format/parser_test.cc" ]
-  deps = [
-    ":str_format_internal",
     ":string_view",
     "//third_party/abseil-cpp/absl/base:config",
-    "//third_party/abseil-cpp/absl/base:core_headers",
+  ]
+}
+
+absl_test("stringify_stream_test") {
+  sources = [ "internal/stringify_stream_test.cc" ]
+  deps = [
+    ":string_view",
+    ":stringify_stream",
+    "//third_party/abseil-cpp/absl/base:config",
+    "//third_party/abseil-cpp/absl/strings:str_format",
   ]
 }
 
@@ -353,6 +294,18 @@
   ]
 }
 
+absl_test("cord_rep_btree_navigator_test") {
+  sources = [ "internal/cord_rep_btree_navigator_test.cc" ]
+  deps = [
+    ":cord_internal",
+    ":cord_rep_test_util",
+    ":string_view",
+    ":strings",
+    "//third_party/abseil-cpp/absl/base:config",
+    "//third_party/abseil-cpp/absl/base:raw_logging_internal",
+  ]
+}
+
 absl_test("cord_rep_btree_reader_test") {
   sources = [ "internal/cord_rep_btree_reader_test.cc" ]
   deps = [
@@ -636,6 +589,19 @@
   ]
 }
 
+absl_test("cord_buffer_test") {
+  public = [ "cord_buffer_test.cc" ]
+  deps = [
+    ":cord",
+    ":cord_internal",
+    ":cord_rep_test_util",
+    ":string_view",
+    "//third_party/abseil-cpp/absl/base:config",
+    "//third_party/abseil-cpp/absl/base:hardening",
+    "//third_party/abseil-cpp/absl/types:span",
+  ]
+}
+
 absl_test("cord_test") {
   public = [ "cord_test.cc" ]
   deps = [
@@ -665,19 +631,6 @@
   ]
 }
 
-absl_test("cord_buffer_test") {
-  public = [ "cord_buffer_test.cc" ]
-  deps = [
-    ":cord",
-    ":cord_internal",
-    ":cord_rep_test_util",
-    ":string_view",
-    "//third_party/abseil-cpp/absl/base:config",
-    "//third_party/abseil-cpp/absl/base:hardening",
-    "//third_party/abseil-cpp/absl/types:span",
-  ]
-}
-
 absl_test("cordz_test") {
   sources = [ "cordz_test.cc" ]
   deps = [
@@ -698,102 +651,11 @@
   ]
 }
 
-absl_source_set("pow10_helper") {
-  testonly = true
-  sources = [ "internal/pow10_helper.cc" ]
-  public = [ "internal/pow10_helper.h" ]
-  visibility = [ ":*" ]
-  deps = [ "//third_party/abseil-cpp/absl/base:config" ]
-}
-
-absl_test("has_absl_stringify_test") {
-  sources = [ "has_absl_stringify_test.cc" ]
-  deps = [ ":strings" ]
-}
-
-absl_source_set("has_ostream_operator") {
-  public = [ "has_ostream_operator.h" ]
-  deps = [ "//third_party/abseil-cpp/absl/base:config" ]
-}
-
-absl_test("has_ostream_operator_test") {
-  sources = [ "has_ostream_operator_test.cc" ]
-  deps = [ ":has_ostream_operator" ]
-}
-
-absl_test("ascii_test") {
-  sources = [ "ascii_test.cc" ]
-  deps = [
-    ":strings",
-    "//third_party/abseil-cpp/absl/base:core_headers",
-  ]
-}
-
-absl_test("damerau_levenshtein_distance_test") {
-  sources = [ "internal/damerau_levenshtein_distance_test.cc" ]
-  deps = [ ":strings" ]
-}
-
-absl_test("match_test") {
-  sources = [ "match_test.cc" ]
-  deps = [ ":strings" ]
-}
-
 absl_test("str_replace_test") {
   sources = [ "str_replace_test.cc" ]
   deps = [ ":strings" ]
 }
 
-absl_test("string_constant_test") {
-  sources = [ "internal/string_constant_test.cc" ]
-  deps = [ ":strings" ]
-}
-
-absl_test("string_view_test") {
-  sources = [ "string_view_test.cc" ]
-  deps = [
-    ":string_view",
-    "//third_party/abseil-cpp/absl/base:config",
-    "//third_party/abseil-cpp/absl/base:core_headers",
-    "//third_party/abseil-cpp/absl/base:dynamic_annotations",
-    "//third_party/abseil-cpp/absl/meta:type_traits",
-  ]
-}
-
-absl_source_set("stringify_stream") {
-  public = [ "internal/stringify_stream.h" ]
-  visibility = [
-    ":*",
-    "//third_party/abseil-cpp/absl/status:*",
-  ]
-  deps = [
-    ":string_view",
-    "//third_party/abseil-cpp/absl/base:config",
-  ]
-}
-
-absl_test("stringify_stream_test") {
-  sources = [ "internal/stringify_stream_test.cc" ]
-  deps = [
-    ":string_view",
-    ":stringify_stream",
-    "//third_party/abseil-cpp/absl/base:config",
-    "//third_party/abseil-cpp/absl/strings:str_format",
-  ]
-}
-
-absl_test("cord_rep_btree_navigator_test") {
-  sources = [ "internal/cord_rep_btree_navigator_test.cc" ]
-  deps = [
-    ":cord_internal",
-    ":cord_rep_test_util",
-    ":string_view",
-    ":strings",
-    "//third_party/abseil-cpp/absl/base:config",
-    "//third_party/abseil-cpp/absl/base:raw_logging_internal",
-  ]
-}
-
 absl_test("str_split_test") {
   sources = [ "str_split_test.cc" ]
   deps = [
@@ -807,14 +669,6 @@
   ]
 }
 
-absl_test("char_formatting_test") {
-  sources = [ "char_formatting_test.cc" ]
-  deps = [
-    ":str_format",
-    ":strings",
-  ]
-}
-
 absl_test("str_cat_test") {
   sources = [ "str_cat_test.cc" ]
   deps = [
@@ -824,6 +678,152 @@
   ]
 }
 
+absl_source_set("str_format") {
+  public = [ "str_format.h" ]
+  deps = [
+    ":str_format_internal",
+    ":string_view",
+    "//third_party/abseil-cpp/absl/base:config",
+    "//third_party/abseil-cpp/absl/base:core_headers",
+    "//third_party/abseil-cpp/absl/base:nullability",
+    "//third_party/abseil-cpp/absl/types:span",
+  ]
+}
+
+absl_source_set("str_format_internal") {
+  sources = [
+    "internal/str_format/arg.cc",
+    "internal/str_format/bind.cc",
+    "internal/str_format/extension.cc",
+    "internal/str_format/float_conversion.cc",
+    "internal/str_format/output.cc",
+    "internal/str_format/parser.cc",
+  ]
+  public = [
+    "internal/str_format/arg.h",
+    "internal/str_format/bind.h",
+    "internal/str_format/checker.h",
+    "internal/str_format/constexpr_parser.h",
+    "internal/str_format/extension.h",
+    "internal/str_format/float_conversion.h",
+    "internal/str_format/output.h",
+    "internal/str_format/parser.h",
+  ]
+  visibility = [ ":*" ]
+  deps = [
+    ":internal",
+    ":string_view",
+    ":strings",
+    "//third_party/abseil-cpp/absl/base:config",
+    "//third_party/abseil-cpp/absl/base:core_headers",
+    "//third_party/abseil-cpp/absl/container:fixed_array",
+    "//third_party/abseil-cpp/absl/container:inlined_vector",
+    "//third_party/abseil-cpp/absl/functional:function_ref",
+    "//third_party/abseil-cpp/absl/meta:type_traits",
+    "//third_party/abseil-cpp/absl/numeric:bits",
+    "//third_party/abseil-cpp/absl/numeric:int128",
+    "//third_party/abseil-cpp/absl/numeric:representation",
+    "//third_party/abseil-cpp/absl/types:optional",
+    "//third_party/abseil-cpp/absl/types:span",
+    "//third_party/abseil-cpp/absl/utility",
+  ]
+}
+
+absl_test("str_format_test") {
+  sources = [ "str_format_test.cc" ]
+  deps = [
+    ":cord",
+    ":str_format",
+    ":strings",
+    "//third_party/abseil-cpp/absl/base:config",
+    "//third_party/abseil-cpp/absl/base:core_headers",
+    "//third_party/abseil-cpp/absl/types:span",
+  ]
+}
+
+absl_test("str_format_extension_test") {
+  sources = [ "internal/str_format/extension_test.cc" ]
+  deps = [
+    ":str_format",
+    ":str_format_internal",
+    ":strings",
+    "//third_party/abseil-cpp/absl/random",
+  ]
+}
+
+absl_test("str_format_arg_test") {
+  sources = [ "internal/str_format/arg_test.cc" ]
+  deps = [
+    ":str_format",
+    ":str_format_internal",
+    "//third_party/abseil-cpp/absl/base:config",
+  ]
+}
+
+absl_test("str_format_bind_test") {
+  sources = [ "internal/str_format/bind_test.cc" ]
+  deps = [ ":str_format_internal" ]
+}
+
+absl_test("str_format_checker_test") {
+  sources = [ "internal/str_format/checker_test.cc" ]
+  deps = [ ":str_format" ]
+}
+
+absl_test("str_format_convert_test") {
+  if (is_fuchsia) {
+    # This test fails to compile on fuchsia x64 bot
+    sources = []
+  } else {
+    sources = [ "internal/str_format/convert_test.cc" ]
+  }
+  deps = [
+    ":str_format",
+    ":str_format_internal",
+    ":strings",
+    "//third_party/abseil-cpp/absl/base:config",
+    "//third_party/abseil-cpp/absl/base:core_headers",
+    "//third_party/abseil-cpp/absl/base:raw_logging_internal",
+    "//third_party/abseil-cpp/absl/log",
+    "//third_party/abseil-cpp/absl/numeric:int128",
+    "//third_party/abseil-cpp/absl/types:span",
+  ]
+}
+
+absl_test("str_format_output_test") {
+  sources = [ "internal/str_format/output_test.cc" ]
+  deps = [
+    ":cord",
+    ":str_format_internal",
+  ]
+}
+
+absl_test("str_format_parser_test") {
+  sources = [ "internal/str_format/parser_test.cc" ]
+  deps = [
+    ":str_format_internal",
+    ":string_view",
+    "//third_party/abseil-cpp/absl/base:config",
+    "//third_party/abseil-cpp/absl/base:core_headers",
+  ]
+}
+
+absl_source_set("pow10_helper") {
+  testonly = true
+  sources = [ "internal/pow10_helper.cc" ]
+  public = [ "internal/pow10_helper.h" ]
+  visibility = [ ":*" ]
+  deps = [ "//third_party/abseil-cpp/absl/base:config" ]
+}
+
+absl_test("char_formatting_test") {
+  sources = [ "char_formatting_test.cc" ]
+  deps = [
+    ":str_format",
+    ":strings",
+  ]
+}
+
 absl_source_set("generic_printer") {
   sources = [
     "internal/generic_printer.cc",