protogen, encoding/jsonpb, encoding/textpb: rename packages
Rename encoding/*pb to follow the convention of prefixing package names
with 'proto':
google.golang.org/protobuf/encoding/protojson
google.golang.org/protobuf/encoding/prototext
Move protogen under a compiler/ directory, just in case we ever do add
more compiler-related packages.
google.golang.org/protobuf/compiler/protogen
Change-Id: I31010cb5cabcea8274fffcac468477b58b56e8eb
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/177178
Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
diff --git a/encoding/bench_test.go b/encoding/bench_test.go
index 0341b19..5a54130 100644
--- a/encoding/bench_test.go
+++ b/encoding/bench_test.go
@@ -11,8 +11,8 @@
jsonpbV1 "github.com/golang/protobuf/jsonpb"
protoV1 "github.com/golang/protobuf/proto"
- "google.golang.org/protobuf/encoding/jsonpb"
- "google.golang.org/protobuf/encoding/textpb"
+ "google.golang.org/protobuf/encoding/protojson"
+ "google.golang.org/protobuf/encoding/prototext"
pref "google.golang.org/protobuf/reflect/protoreflect"
tpb "google.golang.org/protobuf/internal/testprotos/test"
@@ -145,7 +145,7 @@
if *benchV1 {
protoV1.MarshalTextString(m)
} else {
- _, err := textpb.MarshalOptions{Indent: " "}.Marshal(m)
+ _, err := prototext.MarshalOptions{Indent: " "}.Marshal(m)
if err != nil {
b.Fatal(err)
}
@@ -155,7 +155,7 @@
func BenchmarkTextDecode(b *testing.B) {
m := makeProto()
- in, err := textpb.MarshalOptions{Indent: " "}.Marshal(m)
+ in, err := prototext.MarshalOptions{Indent: " "}.Marshal(m)
if err != nil {
b.Fatal(err)
}
@@ -166,7 +166,7 @@
if *benchV1 {
err = protoV1.UnmarshalText(string(in), m)
} else {
- err = textpb.Unmarshal(m, in)
+ err = prototext.Unmarshal(m, in)
}
if err != nil {
b.Fatal(err)
@@ -182,7 +182,7 @@
jsm := &jsonpbV1.Marshaler{Indent: " "}
_, err = jsm.MarshalToString(m)
} else {
- _, err = jsonpb.MarshalOptions{Indent: " "}.Marshal(m)
+ _, err = protojson.MarshalOptions{Indent: " "}.Marshal(m)
}
if err != nil {
b.Fatal(err)
@@ -192,7 +192,7 @@
func BenchmarkJSONDecode(b *testing.B) {
m := makeProto()
- out, err := jsonpb.MarshalOptions{Indent: " "}.Marshal(m)
+ out, err := protojson.MarshalOptions{Indent: " "}.Marshal(m)
if err != nil {
b.Fatal(err)
}
@@ -203,7 +203,7 @@
if *benchV1 {
err = jsonpbV1.UnmarshalString(string(out), m)
} else {
- err = jsonpb.Unmarshal(m, out)
+ err = protojson.Unmarshal(m, out)
}
if err != nil {
b.Fatal(err)