Skip to content

Commit

Permalink
internal/cmd/generate-protos: fix pkg check for editions features
Browse files Browse the repository at this point in the history
go_features.proto apparently lived in package google.protobuf,
but was later moved to package pb, without updating generate-protos.

This change fixes the oversight and re-generates go_features_gen.go.

Change-Id: I6fd68fdb7b146f32dd610c0bad6ecf5ec940ae78
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/602055
Reviewed-by: Lasse Folger <lassefolger@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
  • Loading branch information
stapelberg committed Jul 31, 2024
1 parent 219bda2 commit 2a82025
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion internal/cmd/generate-protos/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ func protoc(args ...string) {
// generateIdentifiers generates an internal package for descriptor.proto
// and well-known types.
func generateIdentifiers(gen *protogen.Plugin, file *protogen.File) {
if file.Desc.Package() != "google.protobuf" {
if file.Desc.Package() != "google.protobuf" && file.Desc.Package() != "pb" {
return
}

Expand Down
10 changes: 5 additions & 5 deletions internal/genid/go_features_gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 2a82025

Please sign in to comment.