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

reimport gogo-protobuf to adjust inter package imports

parent 1c6efef4
...@@ -27,9 +27,9 @@ ...@@ -27,9 +27,9 @@
package face package face
import ( import (
"github.com/gogo/protobuf/gogoproto" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/gogoproto"
"github.com/gogo/protobuf/plugin/testgen" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/plugin/testgen"
"github.com/gogo/protobuf/protoc-gen-gogo/generator" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/protoc-gen-gogo/generator"
) )
type test struct { type test struct {
......
...@@ -95,8 +95,8 @@ not print their values, while the generated GoString method will always print al ...@@ -95,8 +95,8 @@ not print their values, while the generated GoString method will always print al
package gostring package gostring
import ( import (
"github.com/gogo/protobuf/gogoproto" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/gogoproto"
"github.com/gogo/protobuf/protoc-gen-gogo/generator" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/protoc-gen-gogo/generator"
"strconv" "strconv"
"strings" "strings"
) )
......
...@@ -27,9 +27,9 @@ ...@@ -27,9 +27,9 @@
package gostring package gostring
import ( import (
"github.com/gogo/protobuf/gogoproto" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/gogoproto"
"github.com/gogo/protobuf/plugin/testgen" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/plugin/testgen"
"github.com/gogo/protobuf/protoc-gen-gogo/generator" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/protoc-gen-gogo/generator"
) )
type test struct { type test struct {
......
...@@ -40,8 +40,8 @@ import ( ...@@ -40,8 +40,8 @@ import (
"strconv" "strconv"
"strings" "strings"
pb "github.com/gogo/protobuf/protoc-gen-gogo/descriptor" pb "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/protoc-gen-gogo/descriptor"
"github.com/gogo/protobuf/protoc-gen-gogo/generator" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/protoc-gen-gogo/generator"
) )
// Paths for packages used by code generated in this file, // Paths for packages used by code generated in this file,
......
...@@ -133,11 +133,11 @@ import ( ...@@ -133,11 +133,11 @@ import (
"strconv" "strconv"
"strings" "strings"
"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"
"github.com/gogo/protobuf/protoc-gen-gogo/generator" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/protoc-gen-gogo/generator"
"github.com/gogo/protobuf/vanity" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/vanity"
) )
type NumGen interface { type NumGen interface {
......
...@@ -36,8 +36,8 @@ package oneofcheck ...@@ -36,8 +36,8 @@ package oneofcheck
import ( import (
"fmt" "fmt"
"github.com/gogo/protobuf/gogoproto" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/gogoproto"
"github.com/gogo/protobuf/protoc-gen-gogo/generator" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/protoc-gen-gogo/generator"
"os" "os"
) )
......
...@@ -83,11 +83,11 @@ package populate ...@@ -83,11 +83,11 @@ package populate
import ( import (
"fmt" "fmt"
"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"
"github.com/gogo/protobuf/protoc-gen-gogo/generator" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/protoc-gen-gogo/generator"
"github.com/gogo/protobuf/vanity" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/vanity"
"math" "math"
"strconv" "strconv"
"strings" "strings"
......
...@@ -117,11 +117,11 @@ package size ...@@ -117,11 +117,11 @@ package size
import ( import (
"fmt" "fmt"
"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"
"github.com/gogo/protobuf/protoc-gen-gogo/generator" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/protoc-gen-gogo/generator"
"github.com/gogo/protobuf/vanity" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/vanity"
"strconv" "strconv"
"strings" "strings"
) )
......
...@@ -27,9 +27,9 @@ ...@@ -27,9 +27,9 @@
package size package size
import ( import (
"github.com/gogo/protobuf/gogoproto" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/gogoproto"
"github.com/gogo/protobuf/plugin/testgen" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/plugin/testgen"
"github.com/gogo/protobuf/protoc-gen-gogo/generator" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/protoc-gen-gogo/generator"
) )
type test struct { type test struct {
......
...@@ -91,8 +91,8 @@ not print their values, while the generated String method will always print all ...@@ -91,8 +91,8 @@ not print their values, while the generated String method will always print all
package stringer package stringer
import ( import (
"github.com/gogo/protobuf/gogoproto" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/gogoproto"
"github.com/gogo/protobuf/protoc-gen-gogo/generator" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/protoc-gen-gogo/generator"
"strings" "strings"
) )
......
...@@ -27,9 +27,9 @@ ...@@ -27,9 +27,9 @@
package stringer package stringer
import ( import (
"github.com/gogo/protobuf/gogoproto" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/gogoproto"
"github.com/gogo/protobuf/plugin/testgen" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/plugin/testgen"
"github.com/gogo/protobuf/protoc-gen-gogo/generator" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/protoc-gen-gogo/generator"
) )
type test struct { type test struct {
......
...@@ -203,8 +203,8 @@ A good idea is to let each plugin generate its own tests. ...@@ -203,8 +203,8 @@ A good idea is to let each plugin generate its own tests.
package testgen package testgen
import ( import (
"github.com/gogo/protobuf/gogoproto" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/gogoproto"
"github.com/gogo/protobuf/protoc-gen-gogo/generator" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/protoc-gen-gogo/generator"
) )
type TestPlugin interface { type TestPlugin interface {
......
...@@ -109,8 +109,8 @@ and the following test code: ...@@ -109,8 +109,8 @@ and the following test code:
package union package union
import ( import (
"github.com/gogo/protobuf/gogoproto" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/gogoproto"
"github.com/gogo/protobuf/protoc-gen-gogo/generator" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/protoc-gen-gogo/generator"
) )
type union struct { type union struct {
......
...@@ -27,9 +27,9 @@ ...@@ -27,9 +27,9 @@
package union package union
import ( import (
"github.com/gogo/protobuf/gogoproto" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/gogoproto"
"github.com/gogo/protobuf/plugin/testgen" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/plugin/testgen"
"github.com/gogo/protobuf/protoc-gen-gogo/generator" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/protoc-gen-gogo/generator"
) )
type test struct { type test struct {
......
...@@ -177,10 +177,10 @@ import ( ...@@ -177,10 +177,10 @@ import (
"strconv" "strconv"
"strings" "strings"
"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"
"github.com/gogo/protobuf/protoc-gen-gogo/generator" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/protoc-gen-gogo/generator"
) )
type unmarshal struct { type unmarshal struct {
......
...@@ -44,8 +44,8 @@ import ( ...@@ -44,8 +44,8 @@ import (
"testing" "testing"
"time" "time"
. "github.com/gogo/protobuf/proto" . "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/proto"
. "github.com/gogo/protobuf/proto/testdata" . "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/proto/testdata"
) )
var globalO *Buffer var globalO *Buffer
......
...@@ -34,10 +34,10 @@ package proto_test ...@@ -34,10 +34,10 @@ package proto_test
import ( import (
"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 cloneTestMessage = &pb.MyMessage{ var cloneTestMessage = &pb.MyMessage{
......
...@@ -34,8 +34,8 @@ package proto_test ...@@ -34,8 +34,8 @@ package proto_test
import ( import (
"testing" "testing"
. "github.com/gogo/protobuf/proto" . "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/proto"
pb "github.com/gogo/protobuf/proto/testdata" pb "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/proto/testdata"
) )
// Four identical base messages. // Four identical base messages.
......
...@@ -36,8 +36,8 @@ import ( ...@@ -36,8 +36,8 @@ import (
"reflect" "reflect"
"testing" "testing"
"github.com/gogo/protobuf/proto" "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/proto"
pb "github.com/gogo/protobuf/proto/testdata" pb "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/proto/testdata"
) )
func TestGetExtensionsWithMissingExtensions(t *testing.T) { func TestGetExtensionsWithMissingExtensions(t *testing.T) {
......
...@@ -15,10 +15,10 @@ It has these top-level messages: ...@@ -15,10 +15,10 @@ It has these top-level messages:
*/ */
package proto3_proto package proto3_proto
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 testdata "github.com/gogo/protobuf/proto/testdata" import testdata "gx/QmchriuyWMcqHha3dG86rQyxoswSUpmLUBjuJ2kotB65qR/gogo-protobuf/proto/testdata"
// 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
......
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