all: update import paths for renamed packages

Update paths to packages renamed in
https://go-review.googlesource.com/c/protobuf/+/177178

Change-Id: Ifd43f4edd0c976e9ec84b145cdaf331b42fa6e53
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177400
Reviewed-by: Herbie Ong <[email protected]>

Author: neild

go.mod

@@ -2,4 +2,4 @@ module github.com/golang/protobuf
 
 go 1.9
 
-require google.golang.org/protobuf v0.0.0-20190514172829-e89e6244e0e8
+require google.golang.org/protobuf v0.0.0-20190514231807-cdb777356907

go.sum

@@ -1,2 +1,6 @@
+github.com/golang/protobuf v1.2.1-0.20190514181236-7800af189d76/go.mod h1:Zfz6qcDoDBESdv6JsKsGpgNHnkvwJAJwcA9eL+mOkgc=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 google.golang.org/protobuf v0.0.0-20190514172829-e89e6244e0e8 h1:W21IHLlUZTOSWPAugb7YF/zA4lu4QlPm7T5JwlKYstQ=
 google.golang.org/protobuf v0.0.0-20190514172829-e89e6244e0e8/go.mod h1:791zQGC15vDqjpmPRn1uGPu5oHy/Jzw/Q1n5JsgIIcY=
+google.golang.org/protobuf v0.0.0-20190514231807-cdb777356907 h1:KmA4pf+bs1ucZ/8YCj/VXK0/mkK1olh/jzYhKYiebFE=
+google.golang.org/protobuf v0.0.0-20190514231807-cdb777356907/go.mod h1:HeRLsKXv4+wE27dOIGwnqcOgq6a1O/GJ7mGhiEPnBrU=

internal/cmd/generate-alias/main.go

@@ -18,7 +18,7 @@ import (
 
 	"github.com/golang/protobuf/proto"
 	gengo "google.golang.org/protobuf/cmd/protoc-gen-go/internal_gengo"
-	"google.golang.org/protobuf/protogen"
+	"google.golang.org/protobuf/compiler/protogen"
 	"google.golang.org/protobuf/reflect/protodesc"
 	"google.golang.org/protobuf/reflect/protoreflect"
 

internal/proto/text.go

@@ -12,7 +12,7 @@ import (
 	"io"
 	"reflect"
 
-	"google.golang.org/protobuf/encoding/textpb"
+	"google.golang.org/protobuf/encoding/prototext"
 	preg "google.golang.org/protobuf/reflect/protoregistry"
 	"google.golang.org/protobuf/runtime/protoimpl"
 )
@@ -49,7 +49,7 @@ func (tm *TextMarshaler) Marshal(w io.Writer, pb Message) error {
 	if !tm.Compact {
 		ind = "  "
 	}
-	mo := textpb.MarshalOptions{
+	mo := prototext.MarshalOptions{
 		AllowPartial: true,
 		Indent:       ind,
 	}
@@ -101,7 +101,7 @@ func UnmarshalText(s string, m Message) error {
 	if um, ok := m.(encoding.TextUnmarshaler); ok {
 		return um.UnmarshalText([]byte(s))
 	}
-	err := textpb.Unmarshal(protoimpl.X.MessageOf(m).Interface(), []byte(s))
+	err := prototext.Unmarshal([]byte(s), protoimpl.X.MessageOf(m).Interface())
 	// Return RequiredNotSetError for required not set errors and ignore invalid
 	// UTF-8 errors.
 	mask := nonFatalErrors(err)

protoc-gen-go/main.go

@@ -26,7 +26,7 @@ import (
 
 	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"
+	"google.golang.org/protobuf/compiler/protogen"
 )
 
 func main() {