rewire all generator import

TRON-US · Nov 15, 2019 · 3630eb9 · 3630eb9
1 parent bd6287e
commit 3630eb9
Show file tree

Hide file tree

Showing 29 changed files with 32 additions and 31 deletions.
diff --git a/go.mod b/go.mod
@@ -1,6 +1,5 @@
 module github.com/tron-us/protobuf
 
-require (
-	github.com/kisielk/errcheck v1.2.0 // indirect
-	github.com/kisielk/gotool v1.0.0 // indirect
-)
+go 1.13
+
+require github.com/gogo/protobuf v1.3.1
diff --git a/go.sum b/go.sum
@@ -1,3 +1,5 @@
+github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls=
+github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
 github.com/kisielk/errcheck v1.1.0 h1:ZqfnKyx9KGpRcW04j5nnPDgRgoXUeLh2YFBeFzphcA0=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/errcheck v1.2.0 h1:reN85Pxc5larApoH1keMBiu2GWtPqXQ1nc9gx+jOU+E=

diff --git a/plugin/compare/compare.go b/plugin/compare/compare.go
@@ -32,8 +32,8 @@ import (
 	"github.com/gogo/protobuf/gogoproto"
 	"github.com/gogo/protobuf/proto"
 	descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
-	"github.com/gogo/protobuf/protoc-gen-gogo/generator"
 	"github.com/gogo/protobuf/vanity"
+	"github.com/tron-us/protobuf/protoc-gen-gogo/generator"
 )
 
 type plugin struct {

diff --git a/plugin/compare/comparetest.go b/plugin/compare/comparetest.go
@@ -31,7 +31,7 @@ package compare
 import (
 	"github.com/gogo/protobuf/gogoproto"
 	"github.com/gogo/protobuf/plugin/testgen"
-	"github.com/gogo/protobuf/protoc-gen-gogo/generator"
+	"github.com/tron-us/protobuf/protoc-gen-gogo/generator"
 )
 
 type test struct {

diff --git a/plugin/defaultcheck/defaultcheck.go b/plugin/defaultcheck/defaultcheck.go
@@ -54,7 +54,7 @@ package defaultcheck
 import (
 	"fmt"
 	"github.com/gogo/protobuf/gogoproto"
-	"github.com/gogo/protobuf/protoc-gen-gogo/generator"
+	"github.com/tron-us/protobuf/protoc-gen-gogo/generator"
 	"os"
 )
 

diff --git a/plugin/description/description.go b/plugin/description/description.go
@@ -82,7 +82,7 @@ import (
 	"github.com/gogo/protobuf/gogoproto"
 	"github.com/gogo/protobuf/proto"
 	descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
-	"github.com/gogo/protobuf/protoc-gen-gogo/generator"
+	"github.com/tron-us/protobuf/protoc-gen-gogo/generator"
 )
 
 type plugin struct {

diff --git a/plugin/description/descriptiontest.go b/plugin/description/descriptiontest.go
@@ -31,7 +31,7 @@ package description
 import (
 	"github.com/gogo/protobuf/gogoproto"
 	"github.com/gogo/protobuf/plugin/testgen"
-	"github.com/gogo/protobuf/protoc-gen-gogo/generator"
+	"github.com/tron-us/protobuf/protoc-gen-gogo/generator"
 )
 
 type test struct {

diff --git a/plugin/embedcheck/embedcheck.go b/plugin/embedcheck/embedcheck.go
@@ -50,7 +50,7 @@ import (
 	"os"
 
 	"github.com/gogo/protobuf/gogoproto"
-	"github.com/gogo/protobuf/protoc-gen-gogo/generator"
+	"github.com/tron-us/protobuf/protoc-gen-gogo/generator"
 )
 
 type plugin struct {

diff --git a/plugin/enumstringer/enumstringer.go b/plugin/enumstringer/enumstringer.go
@@ -41,7 +41,7 @@ package enumstringer
 
 import (
 	"github.com/gogo/protobuf/gogoproto"
-	"github.com/gogo/protobuf/protoc-gen-gogo/generator"
+	"github.com/tron-us/protobuf/protoc-gen-gogo/generator"
 )
 
 type enumstringer struct {

diff --git a/plugin/equal/equal.go b/plugin/equal/equal.go
@@ -160,8 +160,8 @@ import (
 	"github.com/gogo/protobuf/gogoproto"
 	"github.com/gogo/protobuf/proto"
 	descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
-	"github.com/gogo/protobuf/protoc-gen-gogo/generator"
 	"github.com/gogo/protobuf/vanity"
+	"github.com/tron-us/protobuf/protoc-gen-gogo/generator"
 )
 
 type plugin struct {

diff --git a/plugin/equal/equaltest.go b/plugin/equal/equaltest.go
@@ -31,7 +31,7 @@ package equal
 import (
 	"github.com/gogo/protobuf/gogoproto"
 	"github.com/gogo/protobuf/plugin/testgen"
-	"github.com/gogo/protobuf/protoc-gen-gogo/generator"
+	"github.com/tron-us/protobuf/protoc-gen-gogo/generator"
 )
 
 type test struct {

diff --git a/plugin/face/face.go b/plugin/face/face.go
@@ -132,7 +132,7 @@ package face
 
 import (
 	"github.com/gogo/protobuf/gogoproto"
-	"github.com/gogo/protobuf/protoc-gen-gogo/generator"
+	"github.com/tron-us/protobuf/protoc-gen-gogo/generator"
 )
 
 type plugin struct {

diff --git a/plugin/face/facetest.go b/plugin/face/facetest.go
@@ -31,7 +31,7 @@ package face
 import (
 	"github.com/gogo/protobuf/gogoproto"
 	"github.com/gogo/protobuf/plugin/testgen"
-	"github.com/gogo/protobuf/protoc-gen-gogo/generator"
+	"github.com/tron-us/protobuf/protoc-gen-gogo/generator"
 )
 
 type test struct {

diff --git a/plugin/gostring/gostring.go b/plugin/gostring/gostring.go
@@ -103,7 +103,7 @@ import (
 	"strings"
 
 	"github.com/gogo/protobuf/gogoproto"
-	"github.com/gogo/protobuf/protoc-gen-gogo/generator"
+	"github.com/tron-us/protobuf/protoc-gen-gogo/generator"
 )
 
 type gostring struct {

diff --git a/plugin/gostring/gostringtest.go b/plugin/gostring/gostringtest.go
@@ -31,7 +31,7 @@ package gostring
 import (
 	"github.com/gogo/protobuf/gogoproto"
 	"github.com/gogo/protobuf/plugin/testgen"
-	"github.com/gogo/protobuf/protoc-gen-gogo/generator"
+	"github.com/tron-us/protobuf/protoc-gen-gogo/generator"
 )
 
 type test struct {

diff --git a/plugin/marshalto/marshalto.go b/plugin/marshalto/marshalto.go
@@ -152,8 +152,8 @@ import (
 	"github.com/gogo/protobuf/gogoproto"
 	"github.com/gogo/protobuf/proto"
 	descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
-	"github.com/gogo/protobuf/protoc-gen-gogo/generator"
 	"github.com/gogo/protobuf/vanity"
+	"github.com/tron-us/protobuf/protoc-gen-gogo/generator"
 )
 
 type NumGen interface {

diff --git a/plugin/oneofcheck/oneofcheck.go b/plugin/oneofcheck/oneofcheck.go
@@ -39,7 +39,7 @@ package oneofcheck
 import (
 	"fmt"
 	"github.com/gogo/protobuf/gogoproto"
-	"github.com/gogo/protobuf/protoc-gen-gogo/generator"
+	"github.com/tron-us/protobuf/protoc-gen-gogo/generator"
 	"os"
 )
 

diff --git a/plugin/populate/populate.go b/plugin/populate/populate.go
@@ -92,8 +92,8 @@ import (
 	"github.com/gogo/protobuf/gogoproto"
 	"github.com/gogo/protobuf/proto"
 	descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
-	"github.com/gogo/protobuf/protoc-gen-gogo/generator"
 	"github.com/gogo/protobuf/vanity"
+	"github.com/tron-us/protobuf/protoc-gen-gogo/generator"
 )
 
 type VarGen interface {

diff --git a/plugin/size/size.go b/plugin/size/size.go
@@ -131,8 +131,8 @@ import (
 	"github.com/gogo/protobuf/gogoproto"
 	"github.com/gogo/protobuf/proto"
 	descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
-	"github.com/gogo/protobuf/protoc-gen-gogo/generator"
 	"github.com/gogo/protobuf/vanity"
+	"github.com/tron-us/protobuf/protoc-gen-gogo/generator"
 )
 
 type size struct {

diff --git a/plugin/size/sizetest.go b/plugin/size/sizetest.go
@@ -31,7 +31,7 @@ package size
 import (
 	"github.com/gogo/protobuf/gogoproto"
 	"github.com/gogo/protobuf/plugin/testgen"
-	"github.com/gogo/protobuf/protoc-gen-gogo/generator"
+	"github.com/tron-us/protobuf/protoc-gen-gogo/generator"
 )
 
 type test struct {

diff --git a/plugin/stringer/stringer.go b/plugin/stringer/stringer.go
@@ -94,7 +94,7 @@ package stringer
 
 import (
 	"github.com/gogo/protobuf/gogoproto"
-	"github.com/gogo/protobuf/protoc-gen-gogo/generator"
+	"github.com/tron-us/protobuf/protoc-gen-gogo/generator"
 	"strings"
 )
 

diff --git a/plugin/stringer/stringertest.go b/plugin/stringer/stringertest.go
@@ -31,7 +31,7 @@ package stringer
 import (
 	"github.com/gogo/protobuf/gogoproto"
 	"github.com/gogo/protobuf/plugin/testgen"
-	"github.com/gogo/protobuf/protoc-gen-gogo/generator"
+	"github.com/tron-us/protobuf/protoc-gen-gogo/generator"
 )
 
 type test struct {

diff --git a/plugin/testgen/testgen.go b/plugin/testgen/testgen.go
@@ -206,7 +206,7 @@ package testgen
 
 import (
 	"github.com/gogo/protobuf/gogoproto"
-	"github.com/gogo/protobuf/protoc-gen-gogo/generator"
+	"github.com/tron-us/protobuf/protoc-gen-gogo/generator"
 )
 
 type TestPlugin interface {

diff --git a/plugin/union/union.go b/plugin/union/union.go
@@ -112,7 +112,7 @@ package union
 
 import (
 	"github.com/gogo/protobuf/gogoproto"
-	"github.com/gogo/protobuf/protoc-gen-gogo/generator"
+	"github.com/tron-us/protobuf/protoc-gen-gogo/generator"
 )
 
 type union struct {

diff --git a/plugin/union/uniontest.go b/plugin/union/uniontest.go
@@ -31,7 +31,7 @@ package union
 import (
 	"github.com/gogo/protobuf/gogoproto"
 	"github.com/gogo/protobuf/plugin/testgen"
-	"github.com/gogo/protobuf/protoc-gen-gogo/generator"
+	"github.com/tron-us/protobuf/protoc-gen-gogo/generator"
 )
 
 type test struct {

diff --git a/plugin/unmarshal/unmarshal.go b/plugin/unmarshal/unmarshal.go
@@ -182,7 +182,7 @@ import (
 	"github.com/gogo/protobuf/gogoproto"
 	"github.com/gogo/protobuf/proto"
 	descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
-	"github.com/gogo/protobuf/protoc-gen-gogo/generator"
+	"github.com/tron-us/protobuf/protoc-gen-gogo/generator"
 )
 
 type unmarshal struct {

diff --git a/protoc-gen-gogo/generator/generator.go b/protoc-gen-gogo/generator/generator.go
@@ -65,8 +65,8 @@ import (
 	"github.com/gogo/protobuf/gogoproto"
 	"github.com/gogo/protobuf/proto"
 	descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
-	"github.com/gogo/protobuf/protoc-gen-gogo/generator/internal/remap"
 	plugin "github.com/gogo/protobuf/protoc-gen-gogo/plugin"
+	"github.com/tron-us/protobuf/protoc-gen-gogo/generator/internal/remap"
 )
 
 // generatedCodeVersion indicates a version of the generated code.

diff --git a/protoc-gen-gogo/grpc/grpc.go b/protoc-gen-gogo/grpc/grpc.go
@@ -40,7 +40,7 @@ import (
 	"strings"
 
 	pb "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
-	"github.com/gogo/protobuf/protoc-gen-gogo/generator"
+	"github.com/tron-us/protobuf/protoc-gen-gogo/generator"
 )
 
 // generatedCodeVersion indicates a version of the generated code.

diff --git a/vanity/command/command.go b/vanity/command/command.go
@@ -52,9 +52,9 @@ import (
 	_ "github.com/gogo/protobuf/plugin/union"
 	_ "github.com/gogo/protobuf/plugin/unmarshal"
 	"github.com/gogo/protobuf/proto"
-	"github.com/gogo/protobuf/protoc-gen-gogo/generator"
 	_ "github.com/gogo/protobuf/protoc-gen-gogo/grpc"
 	plugin "github.com/gogo/protobuf/protoc-gen-gogo/plugin"
+	"github.com/tron-us/protobuf/protoc-gen-gogo/generator"
 )
 
 func Read() *plugin.CodeGeneratorRequest {