go_features.proto: move .proto file next to generated .pb.go file

Change-Id: Ia24ca1ad2186bcc95681081d2719ee834b385728 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/565955 LUCI-TryBot-Result: Go LUCI <[email protected]> Auto-Submit: Lasse Folger <[email protected]> Reviewed-by: Michael Stapelberg <[email protected]>
protocolbuffers · Feb 22, 2024 · f9eb6c7 · f9eb6c7
1 parent 11de0a6
commit f9eb6c7
Show file tree

Hide file tree

Showing 6 changed files with 482 additions and 485 deletions.
diff --git a/cmd/protoc-gen-go/testdata/protoeditions/enum.pb.go b/cmd/protoc-gen-go/testdata/protoeditions/enum.pb.go
diff --git a/cmd/protoc-gen-go/testdata/protoeditions/enum.proto b/cmd/protoc-gen-go/testdata/protoeditions/enum.proto
@@ -6,7 +6,7 @@ edition = "2023";
 
 package goproto.protoc.protoeditions;
 
-import "reflect/protodesc/proto/go_features.proto";
+import "types/gofeaturespb/go_features.proto";
 
 option go_package = "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/protoeditions";
 option features.enum_type = CLOSED;

diff --git a/internal/cmd/generate-protos/main.go b/internal/cmd/generate-protos/main.go
@@ -137,16 +137,13 @@ func generateLocalProtos() {
 		path: "cmd/protoc-gen-go/testdata",
 		pkgPaths: map[string]string{
 			"cmd/protoc-gen-go/testdata/nopackage/nopackage.proto": "google.golang.org/protobuf/cmd/protoc-gen-go/testdata/nopackage",
-			"reflect/protodesc/proto/go_features.proto":            "google.golang.org/protobuf/types/gofeaturespb",
 		},
 		annotate: map[string]bool{"cmd/protoc-gen-go/testdata/annotations/annotations.proto": true},
 	}, {
-		path:     "internal/testprotos",
-		exclude:  map[string]bool{"internal/testprotos/irregular/irregular.proto": true},
-		pkgPaths: map[string]string{"reflect/protodesc/proto/go_features.proto": "google.golang.org/protobuf/types/gofeaturespb"},
+		path:    "internal/testprotos",
+		exclude: map[string]bool{"internal/testprotos/irregular/irregular.proto": true},
 	}, {
-		path:     "reflect/protodesc/proto",
-		pkgPaths: map[string]string{"reflect/protodesc/proto/go_features.proto": "google.golang.org/protobuf/types/gofeaturespb"},
+		path: "reflect/protodesc/proto",
 	}}
 	excludeRx := regexp.MustCompile(`legacy/.*/`)
 	for _, d := range dirs {