From 79de295eb460c3a2949d59c6e3987d9cb54eabc8 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alex@aspect.dev>
Date: Thu, 26 Feb 2026 13:15:49 -0800
Subject: [PATCH] chore: rename toolchain target to diffutils

---
 diff/private/diff.bzl            | 8 ++++----
 diff/toolchain.bzl               | 6 +++---
 e2e/smoke/tools/toolchains/BUILD | 4 ++--
 tools/toolchains/BUILD           | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/diff/private/diff.bzl b/diff/private/diff.bzl
index 2ffab60..4ebb897 100644
--- a/diff/private/diff.bzl
+++ b/diff/private/diff.bzl
@@ -3,7 +3,7 @@
 load("//diff/private:options.bzl", "DiffOptionsInfo")
 
 # We run diff in actions, so we want to use the execution platform toolchain.
-DIFF_TOOLCHAIN_TYPE = "@diff.bzl//diff/toolchain:execution_type"
+DIFFUTILS_TOOLCHAIN_TYPE = "@diff.bzl//diff/toolchain:execution_type"
 
 def _validate_diff_binary(ctx):
     """Validate that the diff binary is GNU diffutils.
@@ -18,7 +18,7 @@ def _validate_diff_binary(ctx):
         The output file containing the validation result, which must be placed in a _validation output group.
     """
     is_bsd_diff = ctx.actions.declare_file(ctx.label.name + ".is_bsd_diff")
-    diffinfo = ctx.toolchains[DIFF_TOOLCHAIN_TYPE].diffinfo
+    diffinfo = ctx.toolchains[DIFFUTILS_TOOLCHAIN_TYPE].diffinfo
     ctx.actions.run_shell(
         inputs = diffinfo.tool_files,
         outputs = [is_bsd_diff],
@@ -54,7 +54,7 @@ def _validate_exit_code(ctx, exit_code_file, error_message = "Diff exited with b
     return exit_code_valid
 
 def _diff_rule_impl(ctx):
-    diffinfo = ctx.toolchains[DIFF_TOOLCHAIN_TYPE].diffinfo
+    diffinfo = ctx.toolchains[DIFFUTILS_TOOLCHAIN_TYPE].diffinfo
     command = "{} {} {} {} > {}; echo $? > {}".format(
         diffinfo.diff_path,
         " ".join(ctx.attr.args),
@@ -131,5 +131,5 @@ diff_rule = rule(
         ),
         "_options": attr.label(default = "//diff:diff_options"),
     },
-    toolchains = [DIFF_TOOLCHAIN_TYPE],
+    toolchains = [DIFFUTILS_TOOLCHAIN_TYPE],
 )
diff --git a/diff/toolchain.bzl b/diff/toolchain.bzl
index 3be738f..53562d4 100644
--- a/diff/toolchain.bzl
+++ b/diff/toolchain.bzl
@@ -11,7 +11,7 @@ DiffutilsInfo = provider(
     },
 )
 
-def _diff_toolchain_impl(ctx):
+def _diffutils_toolchain_impl(ctx):
     if ctx.attr.diff_tool and ctx.attr.diff_path:
         fail("Can only set one of diff_tool or diff_path but both were set.")
     if not ctx.attr.diff_tool and not ctx.attr.diff_path:
@@ -51,8 +51,8 @@ def _diff_toolchain_impl(ctx):
         template_variables,
     ]
 
-diff_toolchain = rule(
-    implementation = _diff_toolchain_impl,
+diffutils_toolchain = rule(
+    implementation = _diffutils_toolchain_impl,
     attrs = {
         "diff_tool": attr.label(
             doc = "A hermetically downloaded executable target for the target platform.",
diff --git a/e2e/smoke/tools/toolchains/BUILD b/e2e/smoke/tools/toolchains/BUILD
index dfd3fea..24b3140 100644
--- a/e2e/smoke/tools/toolchains/BUILD
+++ b/e2e/smoke/tools/toolchains/BUILD
@@ -1,6 +1,6 @@
-load("@diff.bzl//diff:toolchain.bzl", "diff_toolchain")
+load("@diff.bzl//diff:toolchain.bzl", "diffutils_toolchain")
 
-diff_toolchain(
+diffutils_toolchain(
     name = "diffutils_toolchain",
     diff_path = "/usr/bin/diff",
 )
diff --git a/tools/toolchains/BUILD b/tools/toolchains/BUILD
index 2744be3..84ec424 100644
--- a/tools/toolchains/BUILD
+++ b/tools/toolchains/BUILD
@@ -1,6 +1,6 @@
-load("@diff.bzl//diff:toolchain.bzl", "diff_toolchain")
+load("@diff.bzl//diff:toolchain.bzl", "diffutils_toolchain")
 
-diff_toolchain(
+diffutils_toolchain(
     name = "diffutils_toolchain",
     diff_tool = "@diffutils//:diff",
 )