diff options
author | Fabian Meumertzheim <fabian@meumertzhe.im> | 2024-04-03 23:15:03 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-03 21:15:03 +0000 |
commit | c0ef535977f9fd2d9a67243552cd04da285ab629 (patch) | |
tree | 9ce137e376facab0cbc9f6034cff4369999b3e0c | |
parent | daf15ef36dec3ace0b3519008ee85c15716f4e08 (diff) | |
download | bazelbuild-rules_go-c0ef535977f9fd2d9a67243552cd04da285ab629.tar.gz |
Reformat with buildifier (#3910)
36 files changed, 189 insertions, 186 deletions
diff --git a/BUILD.bazel b/BUILD.bazel index 4068fc88..63001fdf 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -1,16 +1,4 @@ load( - "//go/private/tools:lines_sorted_test.bzl", - "lines_sorted_test", -) -load( - "//go/private/rules:nogo.bzl", - "nogo", -) -load( - "//go/private/rules:info.bzl", - "go_info", -) -load( "//go:def.bzl", "TOOLS_NOGO", ) @@ -22,9 +10,21 @@ load( "go_context_data", ) load( + "//go/private/rules:info.bzl", + "go_info", +) +load( + "//go/private/rules:nogo.bzl", + "nogo", +) +load( "//go/private/rules:stdlib.bzl", "stdlib", ) +load( + "//go/private/tools:lines_sorted_test.bzl", + "lines_sorted_test", +) # gazelle:prefix github.com/bazelbuild/rules_go # gazelle:exclude tests diff --git a/docs/doc_helpers.bzl b/docs/doc_helpers.bzl index ceac15b0..a05bab28 100644 --- a/docs/doc_helpers.bzl +++ b/docs/doc_helpers.bzl @@ -12,9 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@io_bazel_stardoc//stardoc:stardoc.bzl", "stardoc") -load("@bazel_skylib//rules:write_file.bzl", "write_file") load("@bazel_skylib//rules:diff_test.bzl", "diff_test") +load("@bazel_skylib//rules:write_file.bzl", "write_file") +load("@io_bazel_stardoc//stardoc:stardoc.bzl", "stardoc") def stardoc_with_diff_test( bzl_library_target, diff --git a/docs/go/core/rules.bzl b/docs/go/core/rules.bzl index 9db8e66a..9dab75aa 100644 --- a/docs/go/core/rules.bzl +++ b/docs/go/core/rules.bzl @@ -114,12 +114,12 @@ Rules """ -load("//go/private/rules:library.bzl", _go_library = "go_library") load("//go/private/rules:binary.bzl", _go_binary = "go_binary") -load("//go/private/rules:test.bzl", _go_test = "go_test") +load("//go/private/rules:cross.bzl", _go_cross_binary = "go_cross_binary") +load("//go/private/rules:library.bzl", _go_library = "go_library") load("//go/private/rules:source.bzl", _go_source = "go_source") +load("//go/private/rules:test.bzl", _go_test = "go_test") load("//go/private/tools:path.bzl", _go_path = "go_path") -load("//go/private/rules:cross.bzl", _go_cross_binary = "go_cross_binary") go_library = _go_library go_binary = _go_binary diff --git a/examples/basic-gazelle/BUILD.bazel b/examples/basic-gazelle/BUILD.bazel index 0caa7062..61802882 100644 --- a/examples/basic-gazelle/BUILD.bazel +++ b/examples/basic-gazelle/BUILD.bazel @@ -1,5 +1,5 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library") load("@bazel_gazelle//:def.bzl", "gazelle") +load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library") # gazelle:prefix github.com/bazelbuild/rules_go/examples/basic-gazelle gazelle(name = "gazelle") diff --git a/examples/basic-gazelle/WORKSPACE b/examples/basic-gazelle/WORKSPACE index 473c4684..e1980a52 100644 --- a/examples/basic-gazelle/WORKSPACE +++ b/examples/basic-gazelle/WORKSPACE @@ -23,13 +23,13 @@ http_archive( ], ) -# Load rules_go ruleset and expose the toolchain and dep rules. -load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies") - # the line below instructs gazelle to save the go dependency definitions # in the deps.bzl file. Located under '//'. load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies") +# Load rules_go ruleset and expose the toolchain and dep rules. +load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies") + ############################################################ # Define your own dependencies here using go_repository. # Else, dependencies declared by rules_go/gazelle will be used. diff --git a/extras/gomock.bzl b/extras/gomock.bzl index 2d1b092e..20e06d2a 100644 --- a/extras/gomock.bzl +++ b/extras/gomock.bzl @@ -22,11 +22,11 @@ # The rules in this files are still under development. Breaking changes are planned. # DO NOT USE IT. -load("//go/private:context.bzl", "go_context") +load("@bazel_skylib//lib:paths.bzl", "paths") load("//go/private:common.bzl", "GO_TOOLCHAIN", "GO_TOOLCHAIN_LABEL") -load("//go/private/rules:wrappers.bzl", go_binary = "go_binary_macro") +load("//go/private:context.bzl", "go_context") load("//go/private:providers.bzl", "GoLibrary") -load("@bazel_skylib//lib:paths.bzl", "paths") +load("//go/private/rules:wrappers.bzl", go_binary = "go_binary_macro") _MOCKGEN_TOOL = Label("//extras/gomock:mockgen") _MOCKGEN_MODEL_LIB = Label("//extras/gomock:mockgen_model") @@ -23,10 +23,18 @@ may change without notice. """ load( + "//extras:gomock.bzl", + _gomock = "gomock", +) +load( "//go/private:context.bzl", _go_context = "go_context", ) load( + "//go/private:go_toolchain.bzl", + _go_toolchain = "go_toolchain", +) +load( "//go/private:providers.bzl", _GoArchive = "GoArchive", _GoArchiveData = "GoArchiveData", @@ -36,43 +44,35 @@ load( _GoSource = "GoSource", ) load( - "//go/private/rules:sdk.bzl", - _go_sdk = "go_sdk", + "//go/private/rules:cross.bzl", + _go_cross_binary = "go_cross_binary", ) load( - "//go/private:go_toolchain.bzl", - _go_toolchain = "go_toolchain", + "//go/private/rules:library.bzl", + _go_tool_library = "go_tool_library", ) load( - "//go/private/rules:wrappers.bzl", - _go_binary_macro = "go_binary_macro", - _go_library_macro = "go_library_macro", - _go_test_macro = "go_test_macro", + "//go/private/rules:nogo.bzl", + _nogo = "nogo_wrapper", +) +load( + "//go/private/rules:sdk.bzl", + _go_sdk = "go_sdk", ) load( "//go/private/rules:source.bzl", _go_source = "go_source", ) load( - "//extras:gomock.bzl", - _gomock = "gomock", + "//go/private/rules:wrappers.bzl", + _go_binary_macro = "go_binary_macro", + _go_library_macro = "go_library_macro", + _go_test_macro = "go_test_macro", ) load( "//go/private/tools:path.bzl", _go_path = "go_path", ) -load( - "//go/private/rules:library.bzl", - _go_tool_library = "go_tool_library", -) -load( - "//go/private/rules:nogo.bzl", - _nogo = "nogo_wrapper", -) -load( - "//go/private/rules:cross.bzl", - _go_cross_binary = "go_cross_binary", -) _TOOLS_NOGO = [ "@org_golang_x_tools//go/analysis/passes/asmdecl:go_default_library", diff --git a/go/deps.bzl b/go/deps.bzl index 5c09153b..efa93df5 100644 --- a/go/deps.bzl +++ b/go/deps.bzl @@ -19,6 +19,10 @@ # anything has been declared. load( + "//go/private:nogo.bzl", + "go_register_nogo_wrapper", +) +load( "//go/private:repositories.bzl", _go_rules_dependencies = "go_rules_dependencies", ) @@ -30,10 +34,6 @@ load( _go_register_toolchains = "go_register_toolchains", _go_wrap_sdk = "go_wrap_sdk", ) -load( - "//go/private:nogo.bzl", - "go_register_nogo_wrapper", -) go_rules_dependencies = _go_rules_dependencies go_register_toolchains = _go_register_toolchains diff --git a/go/private/BUILD.sdk.bazel b/go/private/BUILD.sdk.bazel index 325ae404..5256d6b9 100644 --- a/go/private/BUILD.sdk.bazel +++ b/go/private/BUILD.sdk.bazel @@ -1,9 +1,9 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_sdk") +load("@io_bazel_rules_go//go/private:common.bzl", "RULES_GO_STDLIB_PREFIX") +load("@io_bazel_rules_go//go/private:go_toolchain.bzl", "declare_go_toolchains") load("@io_bazel_rules_go//go/private/rules:binary.bzl", "go_tool_binary") load("@io_bazel_rules_go//go/private/rules:sdk.bzl", "package_list") load("@io_bazel_rules_go//go/private/rules:transition.bzl", "non_go_reset_target") -load("@io_bazel_rules_go//go/private:common.bzl", "RULES_GO_STDLIB_PREFIX") -load("@io_bazel_rules_go//go/private:go_toolchain.bzl", "declare_go_toolchains") -load("@io_bazel_rules_go//go:def.bzl", "go_sdk") package(default_visibility = ["//visibility:public"]) diff --git a/go/private/actions/archive.bzl b/go/private/actions/archive.bzl index 42bf2039..a780cd10 100644 --- a/go/private/actions/archive.bzl +++ b/go/private/actions/archive.bzl @@ -31,13 +31,13 @@ load( "get_archive", ) load( - "//go/private/rules:cgo.bzl", - "cgo_configure", -) -load( "//go/private/actions:compilepkg.bzl", "emit_compilepkg", ) +load( + "//go/private/rules:cgo.bzl", + "cgo_configure", +) def emit_archive(go, source = None, _recompile_suffix = "", recompile_internal_deps = None): """See go/toolchains.rst#archive for full documentation.""" diff --git a/go/private/actions/binary.bzl b/go/private/actions/binary.bzl index 8f2fc96a..6c966995 100644 --- a/go/private/actions/binary.bzl +++ b/go/private/actions/binary.bzl @@ -13,16 +13,16 @@ # limitations under the License. load( + "//go/private:common.bzl", + "ARCHIVE_EXTENSION", + "has_shared_lib_extension", +) +load( "//go/private:mode.bzl", "LINKMODE_C_ARCHIVE", "LINKMODE_C_SHARED", "LINKMODE_PLUGIN", ) -load( - "//go/private:common.bzl", - "ARCHIVE_EXTENSION", - "has_shared_lib_extension", -) def emit_binary( go, diff --git a/go/private/actions/link.bzl b/go/private/actions/link.bzl index 32286416..51875dad 100644 --- a/go/private/actions/link.bzl +++ b/go/private/actions/link.bzl @@ -13,6 +13,10 @@ # limitations under the License. load( + "@bazel_skylib//lib:collections.bzl", + "collections", +) +load( "//go/private:common.bzl", "GO_TOOLCHAIN_LABEL", "as_set", @@ -30,10 +34,6 @@ load( "//go/private:rpath.bzl", "rpath", ) -load( - "@bazel_skylib//lib:collections.bzl", - "collections", -) def _format_archive(d): return "{}={}={}".format(d.label, d.importmap, d.file.path) diff --git a/go/private/actions/stdlib.bzl b/go/private/actions/stdlib.bzl index ab69a6d6..46aef86d 100644 --- a/go/private/actions/stdlib.bzl +++ b/go/private/actions/stdlib.bzl @@ -18,15 +18,15 @@ load( "GO_TOOLCHAIN_LABEL", ) load( - "//go/private:providers.bzl", - "GoStdLib", -) -load( "//go/private:mode.bzl", "LINKMODE_NORMAL", "extldflags_from_cc_toolchain", "link_mode_args", ) +load( + "//go/private:providers.bzl", + "GoStdLib", +) load("//go/private:sdk.bzl", "parse_version") load("//go/private/actions:utils.bzl", "quote_opts") diff --git a/go/private/context.bzl b/go/private/context.bzl index 38e1d673..1b7dfb1d 100644 --- a/go/private/context.bzl +++ b/go/private/context.bzl @@ -12,10 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@io_bazel_rules_go_bazel_features//:features.bzl", "bazel_features") load( - "@bazel_tools//tools/cpp:toolchain_utils.bzl", - "find_cpp_toolchain", + "@bazel_skylib//rules:common_settings.bzl", + "BuildSettingInfo", ) load( "@bazel_tools//tools/build_defs/cc:action_names.bzl", @@ -28,23 +27,22 @@ load( "OBJC_COMPILE_ACTION_NAME", ) load( - ":providers.bzl", - "CgoContextInfo", - "EXPLICIT_PATH", - "EXPORT_PATH", - "GoArchive", - "GoConfigInfo", - "GoContextInfo", - "GoLibrary", - "GoSource", - "GoStdLib", - "INFERRED_PATH", - "get_source", + "@bazel_tools//tools/cpp:toolchain_utils.bzl", + "find_cpp_toolchain", ) +load("@io_bazel_rules_go_bazel_features//:features.bzl", "bazel_features") load( - ":mode.bzl", - "get_mode", - "installsuffix", + "@io_bazel_rules_nogo//:scope.bzl", + NOGO_EXCLUDES = "EXCLUDES", + NOGO_INCLUDES = "INCLUDES", +) +load( + "//go/platform:apple.bzl", + "apple_ensure_options", +) +load( + "//go/private/rules:transition.bzl", + "request_nogo_transition", ) load( ":common.bzl", @@ -56,21 +54,23 @@ load( "is_struct", ) load( - "//go/platform:apple.bzl", - "apple_ensure_options", -) -load( - "@bazel_skylib//rules:common_settings.bzl", - "BuildSettingInfo", -) -load( - "//go/private/rules:transition.bzl", - "request_nogo_transition", + ":mode.bzl", + "get_mode", + "installsuffix", ) load( - "@io_bazel_rules_nogo//:scope.bzl", - NOGO_EXCLUDES = "EXCLUDES", - NOGO_INCLUDES = "INCLUDES", + ":providers.bzl", + "CgoContextInfo", + "EXPLICIT_PATH", + "EXPORT_PATH", + "GoArchive", + "GoConfigInfo", + "GoContextInfo", + "GoLibrary", + "GoSource", + "GoStdLib", + "INFERRED_PATH", + "get_source", ) # cgo requires a gcc/clang style compiler. diff --git a/go/private/extensions.bzl b/go/private/extensions.bzl index e265e262..9a3c7760 100644 --- a/go/private/extensions.bzl +++ b/go/private/extensions.bzl @@ -13,8 +13,8 @@ # limitations under the License. load("@io_bazel_rules_go_bazel_features//:features.bzl", "bazel_features") -load("//go/private:sdk.bzl", "detect_host_platform", "go_download_sdk_rule", "go_host_sdk_rule", "go_multiple_toolchains") load("//go/private:nogo.bzl", "DEFAULT_NOGO", "NOGO_DEFAULT_EXCLUDES", "NOGO_DEFAULT_INCLUDES", "go_register_nogo") +load("//go/private:sdk.bzl", "detect_host_platform", "go_download_sdk_rule", "go_host_sdk_rule", "go_multiple_toolchains") def host_compatible_toolchain_impl(ctx): ctx.file("BUILD.bazel") diff --git a/go/private/go_toolchain.bzl b/go/private/go_toolchain.bzl index 74c865c1..cd112c4d 100644 --- a/go/private/go_toolchain.bzl +++ b/go/private/go_toolchain.bzl @@ -15,6 +15,7 @@ Toolchain rules used by go. """ +load("@bazel_skylib//lib:selects.bzl", "selects") load("//go/private:common.bzl", "GO_TOOLCHAIN") load("//go/private:platforms.bzl", "PLATFORMS") load("//go/private:providers.bzl", "GoSDK") @@ -22,7 +23,6 @@ load("//go/private/actions:archive.bzl", "emit_archive") load("//go/private/actions:binary.bzl", "emit_binary") load("//go/private/actions:link.bzl", "emit_link") load("//go/private/actions:stdlib.bzl", "emit_stdlib") -load("@bazel_skylib//lib:selects.bzl", "selects") def _go_toolchain_impl(ctx): sdk = ctx.attr.sdk[GoSDK] diff --git a/go/private/repositories.bzl b/go/private/repositories.bzl index f5913dd7..094c103c 100644 --- a/go/private/repositories.bzl +++ b/go/private/repositories.bzl @@ -14,12 +14,12 @@ # Once nested repositories work, this file should cease to exist. +load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") load("//go/private:common.bzl", "MINIMUM_BAZEL_VERSION") +load("//go/private:nogo.bzl", "DEFAULT_NOGO", "go_register_nogo") load("//go/private:polyfill_bazel_features.bzl", "polyfill_bazel_features") load("//go/private/skylib/lib:versions.bzl", "versions") -load("//go/private:nogo.bzl", "DEFAULT_NOGO", "go_register_nogo") load("//proto:gogo.bzl", "gogo_special_proto") -load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") def go_rules_dependencies(force = False): """Declares workspaces the Go rules depend on. Workspaces that use diff --git a/go/private/rules/binary.bzl b/go/private/rules/binary.bzl index 6ae81f18..40b4011e 100644 --- a/go/private/rules/binary.bzl +++ b/go/private/rules/binary.bzl @@ -13,10 +13,6 @@ # limitations under the License. load( - "//go/private:context.bzl", - "go_context", -) -load( "//go/private:common.bzl", "GO_TOOLCHAIN", "asm_exts", @@ -24,13 +20,8 @@ load( "go_exts", ) load( - "//go/private:providers.bzl", - "GoLibrary", - "GoSDK", -) -load( - "//go/private/rules:transition.bzl", - "go_transition", + "//go/private:context.bzl", + "go_context", ) load( "//go/private:mode.bzl", @@ -41,6 +32,15 @@ load( "LINKMODE_PLUGIN", "LINKMODE_SHARED", ) +load( + "//go/private:providers.bzl", + "GoLibrary", + "GoSDK", +) +load( + "//go/private/rules:transition.bzl", + "go_transition", +) _EMPTY_DEPSET = depset([]) diff --git a/go/private/rules/cross.bzl b/go/private/rules/cross.bzl index 961e3651..4868d86c 100644 --- a/go/private/rules/cross.bzl +++ b/go/private/rules/cross.bzl @@ -13,15 +13,15 @@ # limitations under the License. load( - "//go/private/rules:transition.bzl", - "go_cross_transition", -) -load( "//go/private:providers.bzl", "GoArchive", "GoLibrary", "GoSource", ) +load( + "//go/private/rules:transition.bzl", + "go_cross_transition", +) def _is_windows(ctx): return ctx.configuration.host_path_separator == ";" diff --git a/go/private/rules/info.bzl b/go/private/rules/info.bzl index 40ef9847..e2d1324c 100644 --- a/go/private/rules/info.bzl +++ b/go/private/rules/info.bzl @@ -13,13 +13,13 @@ # limitations under the License. load( - "//go/private:context.bzl", - "go_context", -) -load( "//go/private:common.bzl", "GO_TOOLCHAIN", ) +load( + "//go/private:context.bzl", + "go_context", +) def _go_info_impl(ctx): go = go_context(ctx) diff --git a/go/private/rules/nogo.bzl b/go/private/rules/nogo.bzl index 559fc931..a4bc085b 100644 --- a/go/private/rules/nogo.bzl +++ b/go/private/rules/nogo.bzl @@ -13,14 +13,14 @@ # limitations under the License. load( - "//go/private:context.bzl", - "go_context", -) -load( "//go/private:common.bzl", "GO_TOOLCHAIN", ) load( + "//go/private:context.bzl", + "go_context", +) +load( "//go/private:providers.bzl", "EXPORT_PATH", "GoArchive", diff --git a/go/private/rules/source.bzl b/go/private/rules/source.bzl index e6d8ab41..48c52336 100644 --- a/go/private/rules/source.bzl +++ b/go/private/rules/source.bzl @@ -13,14 +13,14 @@ # limitations under the License. load( - "//go/private:context.bzl", - "go_context", -) -load( "//go/private:common.bzl", "GO_TOOLCHAIN", ) load( + "//go/private:context.bzl", + "go_context", +) +load( "//go/private:providers.bzl", "GoLibrary", ) diff --git a/go/private/rules/stdlib.bzl b/go/private/rules/stdlib.bzl index 60c85603..87c068a8 100644 --- a/go/private/rules/stdlib.bzl +++ b/go/private/rules/stdlib.bzl @@ -13,14 +13,14 @@ # limitations under the License. load( - "//go/private:context.bzl", - "go_context", -) -load( "//go/private:common.bzl", "GO_TOOLCHAIN", ) load( + "//go/private:context.bzl", + "go_context", +) +load( "//go/private:providers.bzl", "GoConfigInfo", ) diff --git a/go/private/rules/test.bzl b/go/private/rules/test.bzl index 2eb50941..554cd30c 100644 --- a/go/private/rules/test.bzl +++ b/go/private/rules/test.bzl @@ -13,8 +13,8 @@ # limitations under the License. load( - "//go/private:context.bzl", - "go_context", + "@bazel_skylib//lib:structs.bzl", + "structs", ) load( "//go/private:common.bzl", @@ -27,8 +27,12 @@ load( "split_srcs", ) load( - "//go/private/rules:binary.bzl", - "gc_linkopts", + "//go/private:context.bzl", + "go_context", +) +load( + "//go/private:mode.bzl", + "LINKMODES", ) load( "//go/private:providers.bzl", @@ -39,16 +43,12 @@ load( "get_archive", ) load( - "//go/private/rules:transition.bzl", - "go_transition", -) -load( - "//go/private:mode.bzl", - "LINKMODES", + "//go/private/rules:binary.bzl", + "gc_linkopts", ) load( - "@bazel_skylib//lib:structs.bzl", - "structs", + "//go/private/rules:transition.bzl", + "go_transition", ) def _go_test_impl(ctx): diff --git a/go/private/rules/wrappers.bzl b/go/private/rules/wrappers.bzl index 85fc848d..22dd7763 100644 --- a/go/private/rules/wrappers.bzl +++ b/go/private/rules/wrappers.bzl @@ -20,15 +20,15 @@ load( "LINKMODE_NORMAL", ) load( - "//go/private/rules:library.bzl", - "go_library", -) -load( "//go/private/rules:binary.bzl", "go_binary", "go_non_executable_binary", ) load( + "//go/private/rules:library.bzl", + "go_library", +) +load( "//go/private/rules:test.bzl", "go_test", ) diff --git a/go/private/sdk.bzl b/go/private/sdk.bzl index f0b31246..63978902 100644 --- a/go/private/sdk.bzl +++ b/go/private/sdk.bzl @@ -12,10 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. +load("@bazel_tools//tools/build_defs/repo:utils.bzl", "patch", "read_user_netrc", "use_netrc") load("//go/private:common.bzl", "executable_path") load("//go/private:nogo.bzl", "go_register_nogo") load("//go/private/skylib/lib:versions.bzl", "versions") -load("@bazel_tools//tools/build_defs/repo:utils.bzl", "patch", "read_user_netrc", "use_netrc") MIN_SUPPORTED_VERSION = (1, 14, 0) diff --git a/go/private/tools/path.bzl b/go/private/tools/path.bzl index dffebaed..e3b1ed8c 100644 --- a/go/private/tools/path.bzl +++ b/go/private/tools/path.bzl @@ -13,11 +13,8 @@ # limitations under the License. load( - "//go/private:providers.bzl", - "GoArchive", - "GoPath", - "effective_importpath_pkgpath", - "get_archive", + "@bazel_skylib//lib:paths.bzl", + "paths", ) load( "//go/private:common.bzl", @@ -25,8 +22,11 @@ load( "as_list", ) load( - "@bazel_skylib//lib:paths.bzl", - "paths", + "//go/private:providers.bzl", + "GoArchive", + "GoPath", + "effective_importpath_pkgpath", + "get_archive", ) def _go_path_impl(ctx): diff --git a/go/tools/builders/BUILD.bazel b/go/tools/builders/BUILD.bazel index d327a3af..2533b76d 100644 --- a/go/tools/builders/BUILD.bazel +++ b/go/tools/builders/BUILD.bazel @@ -1,6 +1,6 @@ load("//go:def.bzl", "go_binary", "go_source", "go_test") -load("//go/private/rules:transition.bzl", "go_reset_target") load("//go/private:common.bzl", "RULES_GO_STDLIB_PREFIX") +load("//go/private/rules:transition.bzl", "go_reset_target") go_test( name = "filter_test", diff --git a/go/tools/gopackagesdriver/aspect.bzl b/go/tools/gopackagesdriver/aspect.bzl index d76f7f65..fccda50a 100644 --- a/go/tools/gopackagesdriver/aspect.bzl +++ b/go/tools/gopackagesdriver/aspect.bzl @@ -13,14 +13,14 @@ # limitations under the License. load( + "@bazel_skylib//lib:paths.bzl", + "paths", +) +load( "//go/private:providers.bzl", "GoArchive", "GoStdLib", ) -load( - "@bazel_skylib//lib:paths.bzl", - "paths", -) GoPkgInfo = provider() diff --git a/proto/BUILD.bazel b/proto/BUILD.bazel index c6b8ef33..4c47c31c 100644 --- a/proto/BUILD.bazel +++ b/proto/BUILD.bazel @@ -1,13 +1,13 @@ load("@bazel_skylib//:bzl_library.bzl", "bzl_library") load( - "//proto:compiler.bzl", - "go_proto_compiler", -) -load( "//go/private/rules:transition.bzl", "non_go_reset_target", ) load( + "//proto:compiler.bzl", + "go_proto_compiler", +) +load( "//proto/wkt:well_known_types.bzl", "GOGO_WELL_KNOWN_TYPE_REMAPS", "PROTO_RUNTIME_DEPS", diff --git a/proto/def.bzl b/proto/def.bzl index 21a35f7d..6a2a2d72 100644 --- a/proto/def.bzl +++ b/proto/def.bzl @@ -13,19 +13,18 @@ # limitations under the License. load( - "//go:def.bzl", - "GoLibrary", - "GoSource", - "go_context", -) -load( "@bazel_skylib//lib:types.bzl", "types", ) load( - "//proto:compiler.bzl", - "GoProtoCompiler", - "proto_path", + "@rules_proto//proto:defs.bzl", + "ProtoInfo", +) +load( + "//go:def.bzl", + "GoLibrary", + "GoSource", + "go_context", ) load( "//go/private:common.bzl", @@ -36,8 +35,9 @@ load( "non_go_tool_transition", ) load( - "@rules_proto//proto:defs.bzl", - "ProtoInfo", + "//proto:compiler.bzl", + "GoProtoCompiler", + "proto_path", ) GoProtoImports = provider() diff --git a/tests/core/cross/BUILD.bazel b/tests/core/cross/BUILD.bazel index 44edfc82..ac34bd91 100644 --- a/tests/core/cross/BUILD.bazel +++ b/tests/core/cross/BUILD.bazel @@ -35,7 +35,10 @@ go_binary( go_binary( name = "asm_cross", - srcs = ["asm.s", "main.go"], + srcs = [ + "asm.s", + "main.go", + ], goarch = "386", goos = "linux", deps = [":platform_lib"], diff --git a/tests/core/go_binary/BUILD.bazel b/tests/core/go_binary/BUILD.bazel index 70901b89..a5c1628e 100644 --- a/tests/core/go_binary/BUILD.bazel +++ b/tests/core/go_binary/BUILD.bazel @@ -1,7 +1,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library", "go_test") load("@io_bazel_rules_go//go/tools/bazel_testing:def.bzl", "go_bazel_test") -load(":many_deps.bzl", "many_deps") load(":linkmode.bzl", "linkmode_pie_wrapper") +load(":many_deps.bzl", "many_deps") test_suite(name = "go_binary") diff --git a/tests/core/go_path/pkg/lib/BUILD.bazel b/tests/core/go_path/pkg/lib/BUILD.bazel index 68f7c0b4..662c5fc7 100644 --- a/tests/core/go_path/pkg/lib/BUILD.bazel +++ b/tests/core/go_path/pkg/lib/BUILD.bazel @@ -1,5 +1,5 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") load("@bazel_skylib//rules:copy_file.bzl", "copy_file") +load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") load(":generated_embeded.bzl", "generated_embeded") go_library( diff --git a/tests/extras/gomock/reflective/BUILD.bazel b/tests/extras/gomock/reflective/BUILD.bazel index 4313cae9..9a867d1a 100644 --- a/tests/extras/gomock/reflective/BUILD.bazel +++ b/tests/extras/gomock/reflective/BUILD.bazel @@ -17,9 +17,9 @@ go_library( gomock( name = "mocks", out = "client_mock.go", + interfaces = ["Client"], library = ":client", package = "client", - interfaces = ["Client"], visibility = ["//visibility:public"], ) diff --git a/tests/extras/gomock/source_with_importpath/BUILD.bazel b/tests/extras/gomock/source_with_importpath/BUILD.bazel index 32308586..efaeeb33 100644 --- a/tests/extras/gomock/source_with_importpath/BUILD.bazel +++ b/tests/extras/gomock/source_with_importpath/BUILD.bazel @@ -10,9 +10,9 @@ go_library( importpath = "github.com/bazelbuild/rules_go/gomock/client", visibility = ["//visibility:public"], deps = [ + "@com_github_golang_mock//gomock", "@org_golang_google_genproto//googleapis/bytestream", "@org_golang_google_grpc//:grpc", - "@com_github_golang_mock//gomock", ], ) @@ -21,9 +21,9 @@ go_library( gomock( name = "mocks", out = "client_mock.go", - source_importpath = "github.com/bazelbuild/rules_go/gomock/client", package = "client", source = "client.go", + source_importpath = "github.com/bazelbuild/rules_go/gomock/client", visibility = ["//visibility:public"], ) |