瀏覽代碼

replace gogofast with gogofaster extension

gogofaster is identical as gogofast but removes XXX_unrecognized

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
CrazyMax 2 年之前
父節點
當前提交
735537d6b1

+ 1 - 1
api/types/plugins/logdriver/gen.go

@@ -1,3 +1,3 @@
-//go:generate protoc --gogofast_out=import_path=github.com/docker/docker/api/types/plugins/logdriver:. entry.proto
+//go:generate protoc --gogofaster_out=import_path=github.com/docker/docker/api/types/plugins/logdriver:. entry.proto
 
 package logdriver // import "github.com/docker/docker/api/types/plugins/logdriver"

+ 1 - 1
api/types/swarm/runtime/gen.go

@@ -1,3 +1,3 @@
-//go:generate protoc --gogofast_out=import_path=github.com/docker/docker/api/types/swarm/runtime:. plugin.proto
+//go:generate protoc --gogofaster_out=import_path=github.com/docker/docker/api/types/swarm/runtime:. plugin.proto
 
 package runtime // import "github.com/docker/docker/api/types/swarm/runtime"

+ 1 - 1
hack/dockerfiles/generate-files.Dockerfile

@@ -36,7 +36,7 @@ RUN --mount=from=src,source=/out,target=.,rw \
   set -ex
   ./hack/with-go-mod.sh go install -v -mod=vendor -modfile=vendor.mod \
     github.com/gogo/protobuf/protoc-gen-gogo \
-    github.com/gogo/protobuf/protoc-gen-gogofast \
+    github.com/gogo/protobuf/protoc-gen-gogofaster \
     github.com/gogo/protobuf/protoc-gen-gogoslick \
     github.com/golang/protobuf/protoc-gen-go
   ./hack/with-go-mod.sh go build -v -mod=vendor -modfile=vendor.mod \

+ 1 - 1
internal/tools/tools.go

@@ -9,7 +9,7 @@ package tools
 
 import (
 	_ "github.com/gogo/protobuf/protoc-gen-gogo"
-	_ "github.com/gogo/protobuf/protoc-gen-gogofast"
+	_ "github.com/gogo/protobuf/protoc-gen-gogofaster"
 	_ "github.com/gogo/protobuf/protoc-gen-gogoslick"
 	_ "github.com/golang/protobuf/protoc-gen-go"
 )

+ 1 - 1
libnetwork/agent.go

@@ -1,6 +1,6 @@
 package libnetwork
 
-//go:generate protoc -I=. -I=../vendor/ --gogo_out=import_path=github.com/docker/docker/libnetwork:. agent.proto
+//go:generate protoc -I=. -I=../vendor/ --gogofaster_out=import_path=github.com/docker/docker/libnetwork:. agent.proto
 
 import (
 	"encoding/json"

+ 1 - 1
libnetwork/drivers/overlay/overlay.go

@@ -2,7 +2,7 @@
 
 package overlay
 
-//go:generate protoc -I=. -I=../../../vendor/ --gogo_out=import_path=github.com/docker/docker/libnetwork/drivers/overlay:. overlay.proto
+//go:generate protoc -I=. -I=../../../vendor/ --gogofaster_out=import_path=github.com/docker/docker/libnetwork/drivers/overlay:. overlay.proto
 
 import (
 	"fmt"

+ 1 - 1
libnetwork/networkdb/networkdb.go

@@ -1,6 +1,6 @@
 package networkdb
 
-//go:generate protoc -I=. -I=../../vendor/ --gogo_out=import_path=github.com/docker/docker/libnetwork/networkdb:. networkdb.proto
+//go:generate protoc -I=. -I=../../vendor/ --gogofaster_out=import_path=github.com/docker/docker/libnetwork/networkdb:. networkdb.proto
 
 import (
 	"context"

+ 5 - 0
vendor/github.com/gogo/protobuf/protoc-gen-gogofast/main.go → vendor/github.com/gogo/protobuf/protoc-gen-gogofaster/main.go

@@ -42,6 +42,11 @@ func main() {
 	vanity.ForEachFile(files, vanity.TurnOnSizerAll)
 	vanity.ForEachFile(files, vanity.TurnOnUnmarshalerAll)
 
+	vanity.ForEachFieldInFilesExcludingExtensions(vanity.OnlyProto2(files), vanity.TurnOffNullableForNativeTypesWithoutDefaultsOnly)
+	vanity.ForEachFile(files, vanity.TurnOffGoUnrecognizedAll)
+	vanity.ForEachFile(files, vanity.TurnOffGoUnkeyedAll)
+	vanity.ForEachFile(files, vanity.TurnOffGoSizecacheAll)
+
 	resp := command.Generate(req)
 	command.Write(resp)
 }

+ 1 - 1
vendor/modules.txt

@@ -469,7 +469,7 @@ github.com/gogo/protobuf/protoc-gen-gogo/generator
 github.com/gogo/protobuf/protoc-gen-gogo/generator/internal/remap
 github.com/gogo/protobuf/protoc-gen-gogo/grpc
 github.com/gogo/protobuf/protoc-gen-gogo/plugin
-github.com/gogo/protobuf/protoc-gen-gogofast
+github.com/gogo/protobuf/protoc-gen-gogofaster
 github.com/gogo/protobuf/protoc-gen-gogoslick
 github.com/gogo/protobuf/sortkeys
 github.com/gogo/protobuf/types