Commit 1c077de5 authored by Jeromy's avatar Jeromy
Browse files

reimport gogo-protobuf to adjust inter package imports

parent 1c6efef4
...@@ -34,9 +34,9 @@ package proto_test ...@@ -34,9 +34,9 @@ package proto_test
import ( import (
"testing" "testing"
"github.com/gogo/protobuf/proto" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/proto"
pb "github.com/gogo/protobuf/proto/proto3_proto" pb "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/proto/proto3_proto"
tpb "github.com/gogo/protobuf/proto/testdata" tpb "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/proto/testdata"
) )
func TestProto3ZeroValues(t *testing.T) { func TestProto3ZeroValues(t *testing.T) {
......
...@@ -36,9 +36,9 @@ import ( ...@@ -36,9 +36,9 @@ import (
"strings" "strings"
"testing" "testing"
. "github.com/gogo/protobuf/proto" . "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/proto"
proto3pb "github.com/gogo/protobuf/proto/proto3_proto" proto3pb "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/proto/proto3_proto"
pb "github.com/gogo/protobuf/proto/testdata" pb "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/proto/testdata"
) )
var messageWithExtension1 = &pb.MyMessage{Count: Int32(7)} var messageWithExtension1 = &pb.MyMessage{Count: Int32(7)}
......
...@@ -39,7 +39,7 @@ It has these top-level messages: ...@@ -39,7 +39,7 @@ It has these top-level messages:
*/ */
package testdata package testdata
import proto "github.com/gogo/protobuf/proto" import proto "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/proto"
import fmt "fmt" import fmt "fmt"
import math "math" import math "math"
......
...@@ -36,9 +36,9 @@ import ( ...@@ -36,9 +36,9 @@ import (
"reflect" "reflect"
"testing" "testing"
. "github.com/gogo/protobuf/proto" . "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/proto"
proto3pb "github.com/gogo/protobuf/proto/proto3_proto" proto3pb "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/proto/proto3_proto"
. "github.com/gogo/protobuf/proto/testdata" . "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/proto/testdata"
) )
type UnmarshalTextTest struct { type UnmarshalTextTest struct {
......
...@@ -39,10 +39,10 @@ import ( ...@@ -39,10 +39,10 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/gogo/protobuf/proto" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/proto"
proto3pb "github.com/gogo/protobuf/proto/proto3_proto" proto3pb "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/proto/proto3_proto"
pb "github.com/gogo/protobuf/proto/testdata" pb "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/proto/testdata"
) )
// textMessage implements the methods that allow it to marshal and unmarshal // textMessage implements the methods that allow it to marshal and unmarshal
......
...@@ -37,7 +37,7 @@ import ( ...@@ -37,7 +37,7 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/gogo/protobuf/version" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/version"
) )
type MixMatch struct { type MixMatch struct {
......
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
package main package main
import ( import (
"github.com/gogo/protobuf/vanity" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/vanity"
"github.com/gogo/protobuf/vanity/command" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/vanity/command"
) )
func main() { func main() {
......
...@@ -30,7 +30,7 @@ It has these top-level messages: ...@@ -30,7 +30,7 @@ It has these top-level messages:
*/ */
package descriptor package descriptor
import proto "github.com/gogo/protobuf/proto" import proto "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/proto"
import fmt "fmt" import fmt "fmt"
import math "math" import math "math"
......
...@@ -3,7 +3,7 @@ package descriptor ...@@ -3,7 +3,7 @@ package descriptor
import fmt "fmt" import fmt "fmt"
import strings "strings" import strings "strings"
import github_com_gogo_protobuf_proto "github.com/gogo/protobuf/proto" import github_com_gogo_protobuf_proto "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/proto"
import sort "sort" import sort "sort"
import strconv "strconv" import strconv "strconv"
import reflect "reflect" import reflect "reflect"
......
...@@ -57,10 +57,10 @@ import ( ...@@ -57,10 +57,10 @@ import (
"unicode" "unicode"
"unicode/utf8" "unicode/utf8"
"github.com/gogo/protobuf/gogoproto" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/gogoproto"
"github.com/gogo/protobuf/proto" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/proto"
descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor" descriptor "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/protoc-gen-gogo/descriptor"
plugin "github.com/gogo/protobuf/protoc-gen-gogo/plugin" plugin "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/protoc-gen-gogo/plugin"
) )
// A Plugin provides functionality to add to the output during Go code generation, // A Plugin provides functionality to add to the output during Go code generation,
......
...@@ -35,10 +35,10 @@ import ( ...@@ -35,10 +35,10 @@ import (
"path" "path"
"github.com/gogo/protobuf/gogoproto" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/gogoproto"
"github.com/gogo/protobuf/proto" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/proto"
descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor" descriptor "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/protoc-gen-gogo/descriptor"
plugin "github.com/gogo/protobuf/protoc-gen-gogo/plugin" plugin "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/protoc-gen-gogo/plugin"
) )
func (d *FileDescriptor) Messages() []*Descriptor { func (d *FileDescriptor) Messages() []*Descriptor {
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
package main package main
import ( import (
"github.com/gogo/protobuf/vanity/command" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/vanity/command"
) )
func main() { func main() {
......
...@@ -14,10 +14,10 @@ It has these top-level messages: ...@@ -14,10 +14,10 @@ It has these top-level messages:
*/ */
package plugin_go package plugin_go
import proto "github.com/gogo/protobuf/proto" import proto "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/proto"
import fmt "fmt" import fmt "fmt"
import math "math" import math "math"
import google_protobuf "github.com/gogo/protobuf/protoc-gen-gogo/descriptor" import google_protobuf "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/protoc-gen-gogo/descriptor"
// Reference imports to suppress errors if they are not otherwise used. // Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal var _ = proto.Marshal
......
...@@ -37,7 +37,7 @@ import ( ...@@ -37,7 +37,7 @@ import (
"testing" "testing"
mytestpb "./my_test" mytestpb "./my_test"
multipb "github.com/gogo/protobuf/protoc-gen-gogo/testdata/multi" multipb "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/protoc-gen-gogo/testdata/multi"
) )
func TestLink(t *testing.T) { func TestLink(t *testing.T) {
......
...@@ -21,7 +21,7 @@ It has these top-level messages: ...@@ -21,7 +21,7 @@ It has these top-level messages:
*/ */
package my_test package my_test
import proto "github.com/gogo/protobuf/proto" import proto "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/proto"
import fmt "fmt" import fmt "fmt"
import math "math" import math "math"
......
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
package main package main
import ( import (
"github.com/gogo/protobuf/vanity" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/vanity"
"github.com/gogo/protobuf/vanity/command" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/vanity/command"
) )
func main() { func main() {
......
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
package main package main
import ( import (
"github.com/gogo/protobuf/vanity" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/vanity"
"github.com/gogo/protobuf/vanity/command" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/vanity/command"
) )
func main() { func main() {
......
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
package main package main
import ( import (
"github.com/gogo/protobuf/vanity" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/vanity"
"github.com/gogo/protobuf/vanity/command" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/vanity/command"
) )
func main() { func main() {
......
...@@ -30,7 +30,7 @@ package main ...@@ -30,7 +30,7 @@ package main
import ( import (
"fmt" "fmt"
"github.com/gogo/protobuf/version" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/version"
"os" "os"
"os/exec" "os/exec"
"strings" "strings"
......
...@@ -32,28 +32,28 @@ import ( ...@@ -32,28 +32,28 @@ import (
"io/ioutil" "io/ioutil"
"os" "os"
"github.com/gogo/protobuf/proto" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/proto"
"github.com/gogo/protobuf/protoc-gen-gogo/generator" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/protoc-gen-gogo/generator"
plugin "github.com/gogo/protobuf/protoc-gen-gogo/plugin" plugin "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/protoc-gen-gogo/plugin"
_ "github.com/gogo/protobuf/plugin/grpc" _ "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/plugin/grpc"
_ "github.com/gogo/protobuf/plugin/defaultcheck" _ "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/plugin/defaultcheck"
_ "github.com/gogo/protobuf/plugin/description" _ "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/plugin/description"
_ "github.com/gogo/protobuf/plugin/embedcheck" _ "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/plugin/embedcheck"
_ "github.com/gogo/protobuf/plugin/enumstringer" _ "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/plugin/enumstringer"
_ "github.com/gogo/protobuf/plugin/equal" _ "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/plugin/equal"
_ "github.com/gogo/protobuf/plugin/face" _ "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/plugin/face"
_ "github.com/gogo/protobuf/plugin/gostring" _ "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/plugin/gostring"
_ "github.com/gogo/protobuf/plugin/marshalto" _ "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/plugin/marshalto"
_ "github.com/gogo/protobuf/plugin/oneofcheck" _ "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/plugin/oneofcheck"
_ "github.com/gogo/protobuf/plugin/populate" _ "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/plugin/populate"
_ "github.com/gogo/protobuf/plugin/size" _ "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/plugin/size"
_ "github.com/gogo/protobuf/plugin/stringer" _ "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/plugin/stringer"
_ "github.com/gogo/protobuf/plugin/union" _ "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/plugin/union"
_ "github.com/gogo/protobuf/plugin/unmarshal" _ "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/plugin/unmarshal"
"github.com/gogo/protobuf/plugin/testgen" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/plugin/testgen"
"go/format" "go/format"
"strings" "strings"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment