Automatic code cleanup.

PiperOrigin-RevId: 707385492
Change-Id: I250093f03bf21ed2f009ac6be9e9e2252b4f0021

Author: katre

cc/find_cc_toolchain.bzl

@@ -55,6 +55,11 @@ Bazel version is not needed), it's enough to only keep the toolchain type.
 
 CC_TOOLCHAIN_TYPE = Label("@bazel_tools//tools/cpp:toolchain_type")
 
+CC_TOOLCHAIN_ATTRS = {
+    # Needed for Bazel 6.x and 7.x compatibility.
+    "_cc_toolchain": attr.label(default = Label("@rules_cc//cc:current_cc_toolchain")),
+}
+
 def find_cc_toolchain(ctx, *, mandatory = True):
     """
 Returns the current `CcToolchainInfo`.

cc/toolchains/cc_flags_supplier.bzl

@@ -14,7 +14,7 @@
 """Rule that provides the CC_FLAGS Make variable."""
 
 load("//cc:action_names.bzl", "CC_FLAGS_MAKE_VARIABLE_ACTION_NAME")
-load("//cc:find_cc_toolchain.bzl", "find_cpp_toolchain", "use_cc_toolchain")
+load("//cc:find_cc_toolchain.bzl", "CC_TOOLCHAIN_ATTRS", "find_cpp_toolchain", "use_cc_toolchain")
 load("//cc/private/rules_impl:cc_flags_supplier_lib.bzl", "build_cc_flags")
 
 def _cc_flags_supplier_impl(ctx):
@@ -27,9 +27,7 @@ def _cc_flags_supplier_impl(ctx):
 
 cc_flags_supplier = rule(
     implementation = _cc_flags_supplier_impl,
-    attrs = {
-        "_cc_toolchain": attr.label(default = Label("@rules_cc//cc:current_cc_toolchain")),
-    },
+    attrs = CC_TOOLCHAIN_ATTRS,
     toolchains = use_cc_toolchain(),
     fragments = ["cpp"],
 )

cc/toolchains/compiler_flag.bzl

@@ -14,16 +14,14 @@
 
 """Rule that allows select() to differentiate between compilers."""
 
-load("//cc:find_cc_toolchain.bzl", "find_cpp_toolchain", "use_cc_toolchain")
+load("//cc:find_cc_toolchain.bzl", "CC_TOOLCHAIN_ATTRS", "find_cpp_toolchain", "use_cc_toolchain")
 
 def _compiler_flag_impl(ctx):
     toolchain = find_cpp_toolchain(ctx)
     return [config_common.FeatureFlagInfo(value = toolchain.compiler)]
 
 compiler_flag = rule(
     implementation = _compiler_flag_impl,
-    attrs = {
-        "_cc_toolchain": attr.label(default = Label("@rules_cc//cc:current_cc_toolchain")),
-    },
+    attrs = CC_TOOLCHAIN_ATTRS,
     toolchains = use_cc_toolchain(),
 )

examples/my_c_archive/my_c_archive.bzl

@@ -15,7 +15,7 @@
 """Example showing how to create a rule that rules_cc can depend on."""
 
 load("@rules_cc//cc:action_names.bzl", "CPP_LINK_STATIC_LIBRARY_ACTION_NAME")
-load("@rules_cc//cc:find_cc_toolchain.bzl", "find_cpp_toolchain", "use_cc_toolchain")
+load("@rules_cc//cc:find_cc_toolchain.bzl", "CC_TOOLCHAIN_ATTRS", "find_cpp_toolchain", "use_cc_toolchain")
 load("//examples/my_c_compile:my_c_compile.bzl", "MyCCompileInfo")
 
 def _my_c_archive_impl(ctx):
@@ -92,8 +92,7 @@ my_c_archive = rule(
     attrs = {
         "deps": attr.label_list(providers = [CcInfo]),
         "object": attr.label(mandatory = True, providers = [MyCCompileInfo]),
-        "_cc_toolchain": attr.label(default = Label("@rules_cc//cc:current_cc_toolchain")),
-    },
+    } | CC_TOOLCHAIN_ATTRS,
     fragments = ["cpp"],
     toolchains = use_cc_toolchain(),
 )

examples/my_c_compile/my_c_compile.bzl

@@ -15,7 +15,7 @@
 """Example showing how to create a rule that just compiles C sources."""
 
 load("@rules_cc//cc:action_names.bzl", "C_COMPILE_ACTION_NAME")
-load("@rules_cc//cc:find_cc_toolchain.bzl", "find_cpp_toolchain", "use_cc_toolchain")
+load("@rules_cc//cc:find_cc_toolchain.bzl", "CC_TOOLCHAIN_ATTRS", "find_cpp_toolchain", "use_cc_toolchain")
 
 MyCCompileInfo = provider(doc = "", fields = ["object"])
 
@@ -74,8 +74,7 @@ my_c_compile = rule(
     implementation = _my_c_compile_impl,
     attrs = {
         "src": attr.label(mandatory = True, allow_single_file = True),
-        "_cc_toolchain": attr.label(default = Label("@rules_cc//cc:current_cc_toolchain")),
-    },
+    } | CC_TOOLCHAIN_ATTRS,
     toolchains = use_cc_toolchain(),
     fragments = ["cpp"],
 )

examples/write_cc_toolchain_cpu/write_cc_toolchain_cpu.bzl

@@ -14,7 +14,7 @@
 
 """Example showing how to get CcToolchainInfo in a custom rule."""
 
-load("@rules_cc//cc:find_cc_toolchain.bzl", "find_cpp_toolchain", "use_cc_toolchain")
+load("@rules_cc//cc:find_cc_toolchain.bzl", "CC_TOOLCHAIN_ATTRS", "find_cpp_toolchain", "use_cc_toolchain")
 
 def _write_cc_toolchain_cpu_impl(ctx):
     cc_toolchain = find_cpp_toolchain(ctx)
@@ -25,8 +25,6 @@ def _write_cc_toolchain_cpu_impl(ctx):
 # This rule does nothing, just writes the target_cpu from the cc_toolchain used for this build.
 write_cc_toolchain_cpu = rule(
     implementation = _write_cc_toolchain_cpu_impl,
-    attrs = {
-        "_cc_toolchain": attr.label(default = Label("@rules_cc//cc:current_cc_toolchain")),
-    },
+    attrs = CC_TOOLCHAIN_ATTRS,
     toolchains = use_cc_toolchain(),
 )