chore: cleanup maybe patterns (#139)

Author: gregmagolan

format/repositories.bzl

@@ -6,14 +6,14 @@ Needed until Bazel 7 allows MODULE.bazel to directly call repository rules.
 load("@bazel_tools//tools/build_defs/repo:http.bzl", _http_archive = "http_archive", _http_file = "http_file", _http_jar = "http_jar")
 load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 
-def http_archive(name, **kwargs):
-    maybe(_http_archive, name = name, **kwargs)
+def http_archive(**kwargs):
+    maybe(_http_archive, **kwargs)
 
-def http_file(name, **kwargs):
-    maybe(_http_file, name = name, **kwargs)
+def http_file(**kwargs):
+    maybe(_http_file, **kwargs)
 
-def http_jar(name, **kwargs):
-    maybe(_http_jar, name = name, **kwargs)
+def http_jar(**kwargs):
+    maybe(_http_jar, **kwargs)
 
 def fetch_pmd():
     http_archive(

lint/BUILD.bazel

@@ -126,6 +126,7 @@ bzl_library(
     visibility = ["//visibility:public"],
     deps = [
         "//lint/private:lint_aspect",
+        "//lint/private:maybe",
         "@bazel_skylib//rules:native_binary",
         "@bazel_tools//tools/build_defs/repo:http.bzl",
         "@bazel_tools//tools/build_defs/repo:utils.bzl",

lint/private/BUILD.bazel

@@ -7,6 +7,12 @@ bzl_library(
     visibility = ["//lint:__subpackages__"],
 )
 
+bzl_library(
+    name = "maybe",
+    srcs = ["maybe.bzl"],
+    visibility = ["//lint:__subpackages__"],
+)
+
 js_binary(
     name = "patcher",
     entry_point = "patcher.mjs",

lint/private/maybe.bzl

@@ -0,0 +1,7 @@
+"maybe utilities"
+
+load("@bazel_tools//tools/build_defs/repo:http.bzl", _http_archive = "http_archive")
+load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
+
+def maybe_http_archive(**kwargs):
+    maybe(_http_archive, **kwargs)

lint/shellcheck.bzl

@@ -17,9 +17,8 @@ shellcheck = shellcheck_aspect(
 """
 
 load("@bazel_skylib//rules:native_binary.bzl", "native_binary")
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 load("//lint/private:lint_aspect.bzl", "filter_srcs", "report_file")
+load("//lint/private:maybe.bzl", http_archive = "maybe_http_archive")
 
 _MNEMONIC = "shellcheck"
 
@@ -125,8 +124,7 @@ def fetch_shellcheck(version = SHELLCHECK_VERSIONS.keys()[0]):
         version: a version of shellcheck that we have mirrored, e.g. `v0.9.0`
     """
     for plat, sha256 in SHELLCHECK_VERSIONS[version].items():
-        maybe(
-            http_archive,
+        http_archive(
             name = "shellcheck_{}".format(plat),
             url = "https://github.com/koalaman/shellcheck/releases/download/{version}/shellcheck-{version}.{plat}.tar.xz".format(
                 version = version,