Merge branch 'bazelbuild:master' into patch-1

Author: alexbozhenko

.bazelci/presubmit.yml

@@ -62,7 +62,6 @@ tasks:
       - "//..."
   bcr_tests:
     name: BCR test module
-    bazel: 6.3.0 # silent ignore override in `[email protected]`
     platform: ${{ platform }}
     working_directory: tests/bcr
     build_flags:

MODULE.bazel

@@ -1,6 +1,6 @@
 module(
     name = "rules_go",
-    version = "0.48.0",
+    version = "0.48.1",
     compatibility_level = 0,
     repo_name = "io_bazel_rules_go",
 )
@@ -24,7 +24,6 @@ use_repo(
     # This name is ugly on purpose to avoid a conflict with a user-named SDK.
     "io_bazel_rules_nogo",
 )
-
 register_toolchains("@go_toolchains//:all")
 
 bazel_dep(name = "gazelle", version = "0.36.0")

WORKSPACE

@@ -122,10 +122,10 @@ bazel_skylib_workspace()
 
 http_archive(
     name = "bazel_gazelle",
-    sha256 = "75df288c4b31c81eb50f51e2e14f4763cb7548daae126817247064637fd9ea62",
+    sha256 = "b7387f72efb59f876e4daae42f1d3912d0d45563eac7cb23d1de0b094ab588cf",
     urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.36.0/bazel-gazelle-v0.36.0.tar.gz",
-        "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.36.0/bazel-gazelle-v0.36.0.tar.gz",
+        "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.34.0/bazel-gazelle-v0.34.0.tar.gz",
+        "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.34.0/bazel-gazelle-v0.34.0.tar.gz",
     ],
 )
 

go/def.bzl

@@ -121,7 +121,7 @@ TOOLS_NOGO = [str(Label(l)) for l in _TOOLS_NOGO]
 
 # Current version or next version to be tagged. Gazelle and other tools may
 # check this to determine compatibility.
-RULES_GO_VERSION = "0.48.0"
+RULES_GO_VERSION = "0.48.1"
 
 go_context = _go_context
 gomock = _gomock

go/modes.rst

@@ -68,8 +68,6 @@ or using `Bazel configuration transitions`_.
 | Disables cgo, even when a C/C++ toolchain is configured (similar to setting  |
 | ``CGO_ENABLED=0``). Packages that contain cgo code may still be built, but   |
 | the cgo code will be filtered out, and the ``cgo`` build tag will be false.  |
-| Sets the de-facto ``purego`` build tag for conditional inclusion of source   |
-| files.                                                                       |
 +-------------------+---------------------+------------------------------------+
 | :param:`debug`    | :type:`bool`        | :value:`false`                     |
 +-------------------+---------------------+------------------------------------+

go/private/mode.bzl

@@ -122,8 +122,6 @@ def get_mode(ctx, go_toolchain, cgo_context_info, go_config_info):
         tags.append("race")
     if msan:
         tags.append("msan")
-    if pure:
-        tags.append("purego")
 
     return struct(
         static = static,

tests/core/cgo/BUILD.bazel

@@ -334,7 +334,6 @@ go_test(
     data = [
         ":tag_cgo_bin",
         ":tag_pure_bin",
-        ":tag_purego_bin",
     ],
     rundir = ".",
     deps = ["//go/tools/bazel:go_default_library"],
@@ -351,17 +350,6 @@ go_binary(
     pure = "on",
 )
 
-go_binary(
-    name = "tag_purego_bin",
-    srcs = [
-        "tag_purego.go",
-        "tag_purego_err.c",
-        "tag_purego_err.go",
-    ],
-    cgo = True,
-    pure = "on",
-)
-
 go_binary(
     name = "tag_cgo_bin",
     srcs = [

tests/core/cgo/tag_purego.go

@@ -15,9 +15,6 @@ func Test(t *testing.T) {
 		{
 			name: "tag_pure_bin",
 			want: "pure",
-		}, {
-			name: "tag_purego_bin",
-			want: "purego",
 		}, {
 			name: "tag_cgo_bin",
 			want: "cgo",

tests/core/cgo/tag_purego_err.c

@@ -53,8 +53,8 @@ func TestUpdate(t *testing.T) {
 	}
 	got := strings.TrimSpace(string(data))
 	want := strings.TrimSpace(`
-load("@bazel_gazelle//:def.bzl", "gazelle")
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
+load("@bazel_gazelle//:def.bzl", "gazelle")
 
 # gazelle:prefix example.com/hello
 gazelle(

tests/core/cgo/tag_purego_err.go

@@ -1635,7 +1635,7 @@ diff -urN a/internal/genid/BUILD.bazel b/internal/genid/BUILD.bazel
 diff -urN a/internal/impl/BUILD.bazel b/internal/impl/BUILD.bazel
 --- a/internal/impl/BUILD.bazel	1970-01-01 00:00:00.000000000 +0000
 +++ b/internal/impl/BUILD.bazel	2000-01-01 00:00:00.000000000 -0000
-@@ -0,0 +1,113 @@
+@@ -0,0 +1,111 @@
 +load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 +
 +go_library(
@@ -1651,7 +1651,6 @@ diff -urN a/internal/impl/BUILD.bazel b/internal/impl/BUILD.bazel
 +        "codec_map_go112.go",
 +        "codec_message.go",
 +        "codec_messageset.go",
-+        "codec_reflect.go",
 +        "codec_tables.go",
 +        "codec_unsafe.go",
 +        "convert.go",
@@ -1672,7 +1671,6 @@ diff -urN a/internal/impl/BUILD.bazel b/internal/impl/BUILD.bazel
 +        "message_reflect.go",
 +        "message_reflect_field.go",
 +        "message_reflect_gen.go",
-+        "pointer_reflect.go",
 +        "pointer_unsafe.go",
 +        "validate.go",
 +        "weak.go",
@@ -1919,14 +1917,13 @@ diff -urN a/internal/set/BUILD.bazel b/internal/set/BUILD.bazel
 diff -urN a/internal/strs/BUILD.bazel b/internal/strs/BUILD.bazel
 --- a/internal/strs/BUILD.bazel	1970-01-01 00:00:00.000000000 +0000
 +++ b/internal/strs/BUILD.bazel	2000-01-01 00:00:00.000000000 -0000
-@@ -0,0 +1,29 @@
+@@ -0,0 +1,28 @@
 +load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 +
 +go_library(
 +    name = "strs",
 +    srcs = [
 +        "strings.go",
-+        "strings_pure.go",
 +        "strings_unsafe_go120.go",
 +        "strings_unsafe_go121.go",
 +    ],
@@ -3355,7 +3352,7 @@ diff -urN a/reflect/protorange/BUILD.bazel b/reflect/protorange/BUILD.bazel
 diff -urN a/reflect/protoreflect/BUILD.bazel b/reflect/protoreflect/BUILD.bazel
 --- a/reflect/protoreflect/BUILD.bazel	1970-01-01 00:00:00.000000000 +0000
 +++ b/reflect/protoreflect/BUILD.bazel	2000-01-01 00:00:00.000000000 -0000
-@@ -0,0 +1,40 @@
+@@ -0,0 +1,39 @@
 +load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 +
 +go_library(
@@ -3368,7 +3365,6 @@ diff -urN a/reflect/protoreflect/BUILD.bazel b/reflect/protoreflect/BUILD.bazel
 +        "type.go",
 +        "value.go",
 +        "value_equal.go",
-+        "value_pure.go",
 +        "value_union.go",
 +        "value_unsafe_go120.go",
 +        "value_unsafe_go121.go",