lint

Author: Karim Alweheshy

test/internal/custom_toolchain/BUILD

@@ -10,17 +10,17 @@ filegroup(
 # Test target for custom_toolchain
 custom_toolchain(
     name = "test_toolchain",
-    toolchain_name = "TestCustomToolchain",
     overrides = {
         # Key is a label target, value is the tool name
         ":test_swiftc": "swiftc",
     },
+    toolchain_name = "TestCustomToolchain",
 )
 
 # Add a simple test rule that depends on the toolchain
 sh_test(
     name = "custom_toolchain_test",
     srcs = ["custom_toolchain_test.sh"],
-    data = [":test_toolchain"],
     args = ["$(location :test_toolchain)"],
-)
+    data = [":test_toolchain"],
+)

xcodeproj/defs.bzl

@@ -4,6 +4,7 @@ load(
     "//xcodeproj/internal:automatic_target_info.bzl",
     _XcodeProjAutomaticTargetProcessingInfo = "XcodeProjAutomaticTargetProcessingInfo",
 )
+load("//xcodeproj/internal:custom_toolchain.bzl", _custom_toolchain = "custom_toolchain")
 load(
     "//xcodeproj/internal:project_options.bzl",
     _project_options = "project_options",
@@ -24,7 +25,6 @@ load(
 )
 load("//xcodeproj/internal:xcodeprojinfo.bzl", _XcodeProjInfo = "XcodeProjInfo")
 load("//xcodeproj/internal/xcschemes:xcschemes.bzl", _xcschemes = "xcschemes")
-load("//xcodeproj/internal:custom_toolchain.bzl", _custom_toolchain = "custom_toolchain")
 
 # Re-exporting providers
 XcodeProjAutomaticTargetProcessingInfo = _XcodeProjAutomaticTargetProcessingInfo

xcodeproj/internal/custom_toolchain.bzl

@@ -1,3 +1,4 @@
+"""Implementation of the `custom_toolchain` rule."""
 
 def _get_xcode_product_version(*, xcode_config):
     raw_version = str(xcode_config.xcode_version())
@@ -14,15 +15,14 @@ def _get_xcode_product_version(*, xcode_config):
 
     return version_components[3]
 
-
 def _custom_toolchain_impl(ctx):
     xcode_version = _get_xcode_product_version(
         xcode_config = ctx.attr._xcode_config[apple_common.XcodeVersionConfig],
     )
 
     toolchain_name_base = ctx.attr.toolchain_name
     toolchain_dir = ctx.actions.declare_directory(
-        toolchain_name_base + ".{}".format(xcode_version) + ".xctoolchain"
+        toolchain_name_base + ".{}".format(xcode_version) + ".xctoolchain",
     )
 
     resolved_overrides = {}
@@ -35,7 +35,9 @@ def _custom_toolchain_impl(ctx):
 
         if len(files) > 1:
             fail("ERROR: Override for '{}' produces multiple files ({}). Each override must have exactly one file.".format(
-                tool_name, len(files)))
+                tool_name,
+                len(files),
+            ))
 
         override_file = files[0]
         override_files.append(override_file)
@@ -50,9 +52,9 @@ def _custom_toolchain_impl(ctx):
         output = script_file,
         is_executable = True,
         substitutions = {
-            "%toolchain_name_base%": toolchain_name_base,
-            "%toolchain_dir%": toolchain_dir.path,
             "%overrides_list%": overrides_list,
+            "%toolchain_dir%": toolchain_dir.path,
+            "%toolchain_name_base%": toolchain_name_base,
             "%xcode_version%": xcode_version,
         },
     )
@@ -64,9 +66,9 @@ def _custom_toolchain_impl(ctx):
         mnemonic = "CreateCustomToolchain",
         command = script_file.path,
         execution_requirements = {
-            "no-sandbox": "1",
-            "no-cache": "1",
             "local": "1",
+            "no-cache": "1",
+            "no-sandbox": "1",
             "requires-darwin": "1",
         },
         use_default_shell_env = True,
@@ -83,10 +85,12 @@ def _custom_toolchain_impl(ctx):
 custom_toolchain = rule(
     implementation = _custom_toolchain_impl,
     attrs = {
-        "toolchain_name": attr.string(mandatory = True),
         "overrides": attr.label_keyed_string_dict(
-            allow_files = True, mandatory = False, default = {}
+            allow_files = True,
+            mandatory = False,
+            default = {},
         ),
+        "toolchain_name": attr.string(mandatory = True),
         "_symlink_template": attr.label(
             allow_single_file = True,
             default = Label("//xcodeproj/internal/templates:custom_toolchain_symlink.sh"),
@@ -99,4 +103,3 @@ custom_toolchain = rule(
         ),
     },
 )
-