فهرست منبع

all: change module to google.golang.org/protobuf

Temporarily remove go.mod, since we can't generate an accurate one until
the corresponding v2 change is submitted.

Change-Id: I183cb0dde8d01065b955cf4b70e76ae43ac88885
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/176999
Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
Damien Neil 6 سال پیش
والد
کامیت
f3ab391baa

+ 0 - 3
go.mod

@@ -1,3 +0,0 @@
-module github.com/golang/protobuf
-
-require github.com/golang/protobuf/v2 v2.0.0-20190513202118-67c1d9b2c11d

+ 0 - 13
go.sum

@@ -1,13 +0,0 @@
-github.com/golang/protobuf v1.2.1-0.20190322195920-d94fb84e04b7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.2.1-0.20190326022002-be03c15fcaa2/go.mod h1:rZ4veVXHB1S2+o7TKqD9Isxml062IeDutnCDtFPUlCc=
-github.com/golang/protobuf v1.2.1-0.20190416233244-13cf6e79fd39/go.mod h1:RgnTNLHWo9HXezTFX5MTeuXnXx9eeQX8y3Cukv+9HaE=
-github.com/golang/protobuf v1.2.1-0.20190420064300-2b4f3c98b458/go.mod h1:hPB+itxf2EbA0J6prVtJg+ohMeLFLEhlSXXPS2qxTZE=
-github.com/golang/protobuf v1.2.1-0.20190509013249-911a20d79252/go.mod h1:1lePdeOu8oinPqnsR0b0MT7mXK8t1iCeDN4TrHzKWEU=
-github.com/golang/protobuf/v2 v2.0.0-20190322201422-f503c300f70e/go.mod h1:25ZALhydMFaBRgPH58a8zpFe9YXMAMjOYWtB6pNPcoo=
-github.com/golang/protobuf/v2 v2.0.0-20190416222953-ab61d41ec93f/go.mod h1:baUT2weUsA1MR7ocRtLXLmi2B1s4VrUT3S6tO8AYzMw=
-github.com/golang/protobuf/v2 v2.0.0-20190420063524-d24bc72368a2/go.mod h1:wcEMLTNPNYxBFS3yY7kunR0QKUgP/f+wzZaPeTbHi0g=
-github.com/golang/protobuf/v2 v2.0.0-20190509012650-00a323deed55/go.mod h1:pWnbrfE+N2TBYiklDHixM32oa26kuZCiJwxIu0DAl7Y=
-github.com/golang/protobuf/v2 v2.0.0-20190513202118-67c1d9b2c11d h1:YjFyyqqKRB4KxR6rkhIWwPBsCUCHfp7u4vXrru0if04=
-github.com/golang/protobuf/v2 v2.0.0-20190513202118-67c1d9b2c11d/go.mod h1:BvOFOLPdtAzg0go71Nf5Tchso+PBMNnE93vaAZ7dTRU=
-github.com/google/go-cmp v0.2.1-0.20190312032427-6f77996f0c42 h1:q3pnF5JFBNRz8sRD+IRj7Y6DMyYGTNqnZ9axTbSfoNI=
-github.com/google/go-cmp v0.2.1-0.20190312032427-6f77996f0c42/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=

+ 7 - 7
internal/cmd/generate-alias/main.go

@@ -17,14 +17,14 @@ import (
 	"strings"
 
 	"github.com/golang/protobuf/proto"
-	gengo "github.com/golang/protobuf/v2/cmd/protoc-gen-go/internal_gengo"
-	"github.com/golang/protobuf/v2/protogen"
-	"github.com/golang/protobuf/v2/reflect/protodesc"
-	"github.com/golang/protobuf/v2/reflect/protoreflect"
+	gengo "google.golang.org/protobuf/cmd/protoc-gen-go/internal_gengo"
+	"google.golang.org/protobuf/protogen"
+	"google.golang.org/protobuf/reflect/protodesc"
+	"google.golang.org/protobuf/reflect/protoreflect"
 
-	descriptorpb "github.com/golang/protobuf/v2/types/descriptor"
-	knownpb "github.com/golang/protobuf/v2/types/known"
-	pluginpb "github.com/golang/protobuf/v2/types/plugin"
+	descriptorpb "google.golang.org/protobuf/types/descriptor"
+	knownpb "google.golang.org/protobuf/types/known"
+	pluginpb "google.golang.org/protobuf/types/plugin"
 )
 
 func main() {

+ 2 - 2
internal/proto/common.go

@@ -12,8 +12,8 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/golang/protobuf/v2/runtime/protoiface"
-	_ "github.com/golang/protobuf/v2/runtime/protolegacy"
+	"google.golang.org/protobuf/runtime/protoiface"
+	_ "google.golang.org/protobuf/runtime/protolegacy"
 )
 
 type (

+ 2 - 2
internal/proto/defaults.go

@@ -5,8 +5,8 @@
 package proto
 
 import (
-	pref "github.com/golang/protobuf/v2/reflect/protoreflect"
-	"github.com/golang/protobuf/v2/runtime/protoimpl"
+	pref "google.golang.org/protobuf/reflect/protoreflect"
+	"google.golang.org/protobuf/runtime/protoimpl"
 )
 
 // SetDefaults sets unset protocol buffer fields to their default values.

+ 2 - 2
internal/proto/discard.go

@@ -5,8 +5,8 @@
 package proto
 
 import (
-	pref "github.com/golang/protobuf/v2/reflect/protoreflect"
-	"github.com/golang/protobuf/v2/runtime/protoimpl"
+	pref "google.golang.org/protobuf/reflect/protoreflect"
+	"google.golang.org/protobuf/runtime/protoimpl"
 )
 
 // DiscardUnknown recursively discards all unknown fields from this message

+ 1 - 1
internal/proto/properties.go

@@ -11,7 +11,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/golang/protobuf/v2/runtime/protoimpl"
+	"google.golang.org/protobuf/runtime/protoimpl"
 )
 
 // Constants that identify the encoding of a value on the wire.

+ 8 - 8
internal/proto/registry.go

@@ -15,14 +15,14 @@ import (
 	"strings"
 	"sync"
 
-	protoV2 "github.com/golang/protobuf/v2/proto"
-	"github.com/golang/protobuf/v2/reflect/protodesc"
-	pref "github.com/golang/protobuf/v2/reflect/protoreflect"
-	"github.com/golang/protobuf/v2/reflect/protoregistry"
-	"github.com/golang/protobuf/v2/runtime/protoimpl"
-	"github.com/golang/protobuf/v2/runtime/protolegacy"
-
-	descriptorpb "github.com/golang/protobuf/v2/types/descriptor"
+	protoV2 "google.golang.org/protobuf/proto"
+	"google.golang.org/protobuf/reflect/protodesc"
+	pref "google.golang.org/protobuf/reflect/protoreflect"
+	"google.golang.org/protobuf/reflect/protoregistry"
+	"google.golang.org/protobuf/runtime/protoimpl"
+	"google.golang.org/protobuf/runtime/protolegacy"
+
+	descriptorpb "google.golang.org/protobuf/types/descriptor"
 )
 
 // filePath is the path to the proto source file.

+ 3 - 3
internal/proto/text.go

@@ -12,9 +12,9 @@ import (
 	"io"
 	"reflect"
 
-	"github.com/golang/protobuf/v2/encoding/textpb"
-	preg "github.com/golang/protobuf/v2/reflect/protoregistry"
-	"github.com/golang/protobuf/v2/runtime/protoimpl"
+	"google.golang.org/protobuf/encoding/textpb"
+	preg "google.golang.org/protobuf/reflect/protoregistry"
+	"google.golang.org/protobuf/runtime/protoimpl"
 )
 
 // TextMarshaler is a configurable text format marshaler.

+ 1 - 1
internal/wire/wire.go

@@ -13,7 +13,7 @@ import (
 	"math"
 	"math/bits"
 
-	"github.com/golang/protobuf/v2/reflect/protoreflect"
+	"google.golang.org/protobuf/reflect/protoreflect"
 )
 
 // Number represents the field number.

+ 1 - 1
proto/clone.go

@@ -13,7 +13,7 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/golang/protobuf/v2/reflect/protoreflect"
+	"google.golang.org/protobuf/reflect/protoreflect"
 )
 
 // Clone returns a deep copy of a protocol buffer.

+ 1 - 1
proto/discard.go

@@ -11,7 +11,7 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"github.com/golang/protobuf/v2/reflect/protoreflect"
+	"google.golang.org/protobuf/reflect/protoreflect"
 )
 
 type generatedDiscarder interface {

+ 1 - 1
proto/equal.go

@@ -12,7 +12,7 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/golang/protobuf/v2/reflect/protoreflect"
+	"google.golang.org/protobuf/reflect/protoreflect"
 )
 
 /*

+ 3 - 3
proto/extensions.go

@@ -16,9 +16,9 @@ import (
 	"sync"
 
 	"github.com/golang/protobuf/internal/wire"
-	"github.com/golang/protobuf/v2/reflect/protoreflect"
-	"github.com/golang/protobuf/v2/runtime/protoiface"
-	"github.com/golang/protobuf/v2/runtime/protoimpl"
+	"google.golang.org/protobuf/reflect/protoreflect"
+	"google.golang.org/protobuf/runtime/protoiface"
+	"google.golang.org/protobuf/runtime/protoimpl"
 )
 
 // ErrMissingExtension is the error returned by GetExtension if the named extension is not in the message.

+ 2 - 2
proto/hooks_disabled.go

@@ -10,8 +10,8 @@ import (
 	"io"
 	"reflect"
 
-	descriptorpb "github.com/golang/protobuf/v2/types/descriptor"
-	knownpb "github.com/golang/protobuf/v2/types/known"
+	descriptorpb "google.golang.org/protobuf/types/descriptor"
+	knownpb "google.golang.org/protobuf/types/known"
 )
 
 var (

+ 1 - 1
proto/lib.go

@@ -15,7 +15,7 @@ import (
 	"strconv"
 	"sync"
 
-	"github.com/golang/protobuf/v2/runtime/protoiface"
+	"google.golang.org/protobuf/runtime/protoiface"
 )
 
 // requiredNotSetError is an error type returned by either Marshal or Unmarshal.

+ 1 - 1
proto/message_set.go

@@ -12,7 +12,7 @@ import (
 	"errors"
 	"reflect"
 
-	"github.com/golang/protobuf/v2/reflect/protoreflect"
+	"google.golang.org/protobuf/reflect/protoreflect"
 )
 
 // errNoMessageTypeID occurs when a protocol buffer does not have a message type ID.

+ 1 - 1
proto/registry_test.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/golang/protobuf/proto"
 
-	descriptorpb "github.com/golang/protobuf/v2/types/descriptor"
+	descriptorpb "google.golang.org/protobuf/types/descriptor"
 )
 
 func TestRegistry(t *testing.T) {

+ 1 - 1
proto/table_marshal.go

@@ -17,7 +17,7 @@ import (
 	"unicode/utf8"
 
 	"github.com/golang/protobuf/internal/wire"
-	"github.com/golang/protobuf/v2/reflect/protoreflect"
+	"google.golang.org/protobuf/reflect/protoreflect"
 )
 
 // a sizer takes a pointer to a field and the size of its tag, computes the size of

+ 1 - 1
proto/text.go

@@ -19,7 +19,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/golang/protobuf/v2/reflect/protoreflect"
+	"google.golang.org/protobuf/reflect/protoreflect"
 )
 
 var (

+ 4 - 4
protoc-gen-go/descriptor/descriptor.pb.go

@@ -4,10 +4,10 @@
 package descriptor
 
 import (
-	protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
-	protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
-	protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
-	descriptor "github.com/golang/protobuf/v2/types/descriptor"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	descriptor "google.golang.org/protobuf/types/descriptor"
 	sync "sync"
 )
 

+ 3 - 3
protoc-gen-go/main.go

@@ -24,9 +24,9 @@ import (
 	"fmt"
 	"strings"
 
-	gengogrpc "github.com/golang/protobuf/v2/cmd/protoc-gen-go-grpc/internal_gengogrpc"
-	gengo "github.com/golang/protobuf/v2/cmd/protoc-gen-go/internal_gengo"
-	"github.com/golang/protobuf/v2/protogen"
+	gengogrpc "google.golang.org/protobuf/cmd/protoc-gen-go-grpc/internal_gengogrpc"
+	gengo "google.golang.org/protobuf/cmd/protoc-gen-go/internal_gengo"
+	"google.golang.org/protobuf/protogen"
 )
 
 func main() {

+ 4 - 4
protoc-gen-go/plugin/plugin.pb.go

@@ -4,10 +4,10 @@
 package plugin_go
 
 import (
-	protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
-	protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
-	protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
-	plugin "github.com/golang/protobuf/v2/types/plugin"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	plugin "google.golang.org/protobuf/types/plugin"
 	sync "sync"
 )
 

+ 4 - 4
ptypes/any/any.pb.go

@@ -4,10 +4,10 @@
 package any
 
 import (
-	protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
-	protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
-	protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
-	known "github.com/golang/protobuf/v2/types/known"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	known "google.golang.org/protobuf/types/known"
 	sync "sync"
 )
 

+ 4 - 4
ptypes/duration/duration.pb.go

@@ -4,10 +4,10 @@
 package duration
 
 import (
-	protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
-	protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
-	protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
-	known "github.com/golang/protobuf/v2/types/known"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	known "google.golang.org/protobuf/types/known"
 	sync "sync"
 )
 

+ 4 - 4
ptypes/empty/empty.pb.go

@@ -4,10 +4,10 @@
 package empty
 
 import (
-	protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
-	protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
-	protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
-	known "github.com/golang/protobuf/v2/types/known"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	known "google.golang.org/protobuf/types/known"
 	sync "sync"
 )
 

+ 4 - 4
ptypes/struct/struct.pb.go

@@ -4,10 +4,10 @@
 package structpb
 
 import (
-	protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
-	protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
-	protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
-	known "github.com/golang/protobuf/v2/types/known"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	known "google.golang.org/protobuf/types/known"
 	sync "sync"
 )
 

+ 4 - 4
ptypes/timestamp/timestamp.pb.go

@@ -4,10 +4,10 @@
 package timestamp
 
 import (
-	protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
-	protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
-	protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
-	known "github.com/golang/protobuf/v2/types/known"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	known "google.golang.org/protobuf/types/known"
 	sync "sync"
 )
 

+ 4 - 4
ptypes/wrappers/wrappers.pb.go

@@ -4,10 +4,10 @@
 package wrappers
 
 import (
-	protoreflect "github.com/golang/protobuf/v2/reflect/protoreflect"
-	protoregistry "github.com/golang/protobuf/v2/reflect/protoregistry"
-	protoimpl "github.com/golang/protobuf/v2/runtime/protoimpl"
-	known "github.com/golang/protobuf/v2/types/known"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoregistry "google.golang.org/protobuf/reflect/protoregistry"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	known "google.golang.org/protobuf/types/known"
 	sync "sync"
 )