Fix lint

Author: armandomontanez

test/cargo_build_script/cc_args_and_env/cc_args_and_env_test.bzl

@@ -15,9 +15,9 @@ load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
 load("//cargo:defs.bzl", "cargo_build_script")
 
 _EXPECTED_CC_TOOLCHAIN_TOOLS = {
+    "AR": "/usr/fake/ar",
     "CC": "/usr/fake/gcc",
     "CXX": "/usr/fake/g++",
-    "AR": "/usr/fake/ar",
 }
 
 def _test_cc_config_impl(ctx):
@@ -142,9 +142,9 @@ def _test_cc_config_impl(ctx):
 test_cc_config = rule(
     implementation = _test_cc_config_impl,
     attrs = {
+        "extra_ar_flags": attr.string_list(),
         "extra_cc_compile_flags": attr.string_list(),
         "extra_cxx_compile_flags": attr.string_list(),
-        "extra_ar_flags": attr.string_list(),
         "legacy_cc_toolchain": attr.bool(default = False),
     },
     provides = [CcToolchainConfigInfo],
@@ -207,9 +207,9 @@ def _cc_args_and_env_analysis_test_impl(ctx):
         )
 
     _ENV_VAR_TO_EXPECTED_ARGS = {
+        "ARFLAGS": ctx.attr.expected_arflags,
         "CFLAGS": ctx.attr.expected_cflags,
         "CXXFLAGS": ctx.attr.expected_cxxflags,
-        "ARFLAGS": ctx.attr.expected_arflags,
     }
 
     for env_var, expected_flags in _ENV_VAR_TO_EXPECTED_ARGS.items():
@@ -227,9 +227,9 @@ cc_args_and_env_analysis_test = analysistest.make(
     impl = _cc_args_and_env_analysis_test_impl,
     doc = """An analysistest to examine the custom cargo flags of an cargo_build_script target.""",
     attrs = {
+        "expected_arflags": attr.string_list(default = ["-x"]),
         "expected_cflags": attr.string_list(default = ["-Wall"]),
         "expected_cxxflags": attr.string_list(default = ["-fno-rtti"]),
-        "expected_arflags": attr.string_list(default = ["-x"]),
         "legacy_cc_toolchain": attr.bool(default = False),
     },
 )
@@ -251,7 +251,9 @@ def cargo_build_script_with_extra_cc_compile_flags(
 
     Args:
       name: The name of the test target.
-      extra_cc_compile_flags: Extra args for the cc_toolchain.
+      extra_cc_compile_flags: Extra C/C++ args for the cc_toolchain.
+      extra_cxx_compile_flags: Extra C++-specific args for the cc_toolchain.
+      extra_ar_flags: Extra archiver args for the cc_toolchain.
     """
 
     test_cc_config(