proto: move T->*T wrappers from internal/scalar to proto
Usage of these is pervasive in code which works with proto2, and proto2
will be with us for a long, long time to come. Move them to the proto
package.
Change-Id: I1b2e57429fd5a8f107a848a4492d20c27f304bd7
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/185543
Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
diff --git a/encoding/prototext/decode_test.go b/encoding/prototext/decode_test.go
index d32c01e..66c77f3 100644
--- a/encoding/prototext/decode_test.go
+++ b/encoding/prototext/decode_test.go
@@ -10,7 +10,6 @@
"google.golang.org/protobuf/encoding/prototext"
pimpl "google.golang.org/protobuf/internal/impl"
- "google.golang.org/protobuf/internal/scalar"
"google.golang.org/protobuf/proto"
preg "google.golang.org/protobuf/reflect/protoregistry"
@@ -51,21 +50,21 @@
opt_string: ""
`,
wantMessage: &pb2.Scalars{
- OptBool: scalar.Bool(false),
- OptInt32: scalar.Int32(0),
- OptInt64: scalar.Int64(0),
- OptUint32: scalar.Uint32(0),
- OptUint64: scalar.Uint64(0),
- OptSint32: scalar.Int32(0),
- OptSint64: scalar.Int64(0),
- OptFixed32: scalar.Uint32(0),
- OptFixed64: scalar.Uint64(0),
- OptSfixed32: scalar.Int32(0),
- OptSfixed64: scalar.Int64(0),
- OptFloat: scalar.Float32(0),
- OptDouble: scalar.Float64(0),
+ OptBool: proto.Bool(false),
+ OptInt32: proto.Int32(0),
+ OptInt64: proto.Int64(0),
+ OptUint32: proto.Uint32(0),
+ OptUint64: proto.Uint64(0),
+ OptSint32: proto.Int32(0),
+ OptSint64: proto.Int64(0),
+ OptFixed32: proto.Uint32(0),
+ OptFixed64: proto.Uint64(0),
+ OptSfixed32: proto.Int32(0),
+ OptSfixed64: proto.Int64(0),
+ OptFloat: proto.Float32(0),
+ OptDouble: proto.Float64(0),
OptBytes: []byte{},
- OptString: scalar.String(""),
+ OptString: proto.String(""),
},
}, {
desc: "proto3 scalars set to zero values",
@@ -105,19 +104,19 @@
opt_string: "谷歌"
`,
wantMessage: &pb2.Scalars{
- OptBool: scalar.Bool(true),
- OptInt32: scalar.Int32(0xff),
- OptInt64: scalar.Int64(0xdeadbeef),
- OptUint32: scalar.Uint32(0xff),
- OptUint64: scalar.Uint64(0xdeadbeef),
- OptSint32: scalar.Int32(-1001),
- OptSint64: scalar.Int64(-0xffff),
- OptFixed64: scalar.Uint64(64),
- OptSfixed32: scalar.Int32(-32),
- OptFloat: scalar.Float32(1.234),
- OptDouble: scalar.Float64(1.23e100),
+ OptBool: proto.Bool(true),
+ OptInt32: proto.Int32(0xff),
+ OptInt64: proto.Int64(0xdeadbeef),
+ OptUint32: proto.Uint32(0xff),
+ OptUint64: proto.Uint64(0xdeadbeef),
+ OptSint32: proto.Int32(-1001),
+ OptSint64: proto.Int64(-0xffff),
+ OptFixed64: proto.Uint64(64),
+ OptSfixed32: proto.Int32(-32),
+ OptFloat: proto.Float32(1.234),
+ OptDouble: proto.Float64(1.23e100),
OptBytes: []byte("\xe8\xb0\xb7\xe6\xad\x8c"),
- OptString: scalar.String("谷歌"),
+ OptString: proto.String("谷歌"),
},
}, {
desc: "case sensitive",
@@ -425,9 +424,9 @@
`,
wantMessage: &pb2.Nests{
OptNested: &pb2.Nested{
- OptString: scalar.String("nested message"),
+ OptString: proto.String("nested message"),
OptNested: &pb2.Nested{
- OptString: scalar.String("another nested message"),
+ OptString: proto.String("another nested message"),
},
},
},
@@ -589,12 +588,12 @@
wantMessage: &pb2.Nests{
RptNested: []*pb2.Nested{
{
- OptString: scalar.String("repeat nested one"),
+ OptString: proto.String("repeat nested one"),
},
{
- OptString: scalar.String("repeat nested two"),
+ OptString: proto.String("repeat nested two"),
OptNested: &pb2.Nested{
- OptString: scalar.String("inside repeat nested two"),
+ OptString: proto.String("inside repeat nested two"),
},
},
{},
@@ -968,7 +967,7 @@
inputMessage: &pb2.PartialRequired{},
inputText: "req_string: 'this is required'",
wantMessage: &pb2.PartialRequired{
- ReqString: scalar.String("this is required"),
+ ReqString: proto.String("this is required"),
},
}, {
desc: "required fields partially set",
@@ -980,9 +979,9 @@
req_enum: ONE
`,
wantMessage: &pb2.Requireds{
- ReqBool: scalar.Bool(false),
- ReqSfixed64: scalar.Int64(0xbeefcafe),
- ReqString: scalar.String("hello"),
+ ReqBool: proto.Bool(false),
+ ReqSfixed64: proto.Int64(0xbeefcafe),
+ ReqString: proto.String("hello"),
ReqEnum: pb2.Enum_ONE.Enum(),
},
wantErr: true,
@@ -997,9 +996,9 @@
req_enum: ONE
`,
wantMessage: &pb2.Requireds{
- ReqBool: scalar.Bool(false),
- ReqSfixed64: scalar.Int64(0xbeefcafe),
- ReqString: scalar.String("hello"),
+ ReqBool: proto.Bool(false),
+ ReqSfixed64: proto.Int64(0xbeefcafe),
+ ReqString: proto.String("hello"),
ReqEnum: pb2.Enum_ONE.Enum(),
},
}, {
@@ -1014,10 +1013,10 @@
req_nested: {}
`,
wantMessage: &pb2.Requireds{
- ReqBool: scalar.Bool(false),
- ReqSfixed64: scalar.Int64(0),
- ReqDouble: scalar.Float64(0),
- ReqString: scalar.String(""),
+ ReqBool: proto.Bool(false),
+ ReqSfixed64: proto.Int64(0),
+ ReqDouble: proto.Float64(0),
+ ReqString: proto.String(""),
ReqEnum: pb2.Enum_ONE.Enum(),
ReqNested: &pb2.Nested{},
},
@@ -1049,7 +1048,7 @@
wantMessage: &pb2.IndirectRequired{
RptNested: []*pb2.NestedWithRequired{
{
- ReqString: scalar.String("one"),
+ ReqString: proto.String("one"),
},
{},
},
@@ -1068,7 +1067,7 @@
wantMessage: &pb2.IndirectRequired{
RptNested: []*pb2.NestedWithRequired{
{
- ReqString: scalar.String("one"),
+ ReqString: proto.String("one"),
},
{},
},
@@ -1091,7 +1090,7 @@
StrToNested: map[string]*pb2.NestedWithRequired{
"missing": &pb2.NestedWithRequired{},
"contains": &pb2.NestedWithRequired{
- ReqString: scalar.String("here"),
+ ReqString: proto.String("here"),
},
},
},
@@ -1115,7 +1114,7 @@
StrToNested: map[string]*pb2.NestedWithRequired{
"missing": &pb2.NestedWithRequired{},
"contains": &pb2.NestedWithRequired{
- ReqString: scalar.String("here"),
+ ReqString: proto.String("here"),
},
},
},
@@ -1164,17 +1163,17 @@
`,
wantMessage: func() proto.Message {
m := &pb2.Extensions{
- OptString: scalar.String("non-extension field"),
- OptBool: scalar.Bool(true),
- OptInt32: scalar.Int32(42),
+ OptString: proto.String("non-extension field"),
+ OptBool: proto.Bool(true),
+ OptInt32: proto.Int32(42),
}
setExtension(m, pb2.E_OptExtBool, true)
setExtension(m, pb2.E_OptExtString, "extension field")
setExtension(m, pb2.E_OptExtEnum, pb2.Enum_TEN)
setExtension(m, pb2.E_OptExtNested, &pb2.Nested{
- OptString: scalar.String("nested in an extension"),
+ OptString: proto.String("nested in an extension"),
OptNested: &pb2.Nested{
- OptString: scalar.String("another nested in an extension"),
+ OptString: proto.String("another nested in an extension"),
},
})
return m
@@ -1207,9 +1206,9 @@
setExtension(m, pb2.E_RptExtEnum, &[]pb2.Enum{pb2.Enum_TEN, 101, pb2.Enum_ONE})
setExtension(m, pb2.E_RptExtFixed32, &[]uint32{42, 47})
setExtension(m, pb2.E_RptExtNested, &[]*pb2.Nested{
- &pb2.Nested{OptString: scalar.String("one")},
- &pb2.Nested{OptString: scalar.String("two")},
- &pb2.Nested{OptString: scalar.String("three")},
+ &pb2.Nested{OptString: proto.String("one")},
+ &pb2.Nested{OptString: proto.String("two")},
+ &pb2.Nested{OptString: proto.String("three")},
})
return m
}(),
@@ -1232,9 +1231,9 @@
setExtension(m, pb2.E_ExtensionsContainer_OptExtString, "extension field")
setExtension(m, pb2.E_ExtensionsContainer_OptExtEnum, pb2.Enum_TEN)
setExtension(m, pb2.E_ExtensionsContainer_OptExtNested, &pb2.Nested{
- OptString: scalar.String("nested in an extension"),
+ OptString: proto.String("nested in an extension"),
OptNested: &pb2.Nested{
- OptString: scalar.String("another nested in an extension"),
+ OptString: proto.String("another nested in an extension"),
},
})
return m
@@ -1262,16 +1261,16 @@
`,
wantMessage: func() proto.Message {
m := &pb2.Extensions{
- OptString: scalar.String("non-extension field"),
- OptBool: scalar.Bool(true),
- OptInt32: scalar.Int32(42),
+ OptString: proto.String("non-extension field"),
+ OptBool: proto.Bool(true),
+ OptInt32: proto.Int32(42),
}
setExtension(m, pb2.E_ExtensionsContainer_RptExtEnum, &[]pb2.Enum{pb2.Enum_TEN, 101, pb2.Enum_ONE})
setExtension(m, pb2.E_ExtensionsContainer_RptExtString, &[]string{"hello", "world"})
setExtension(m, pb2.E_ExtensionsContainer_RptExtNested, &[]*pb2.Nested{
- &pb2.Nested{OptString: scalar.String("one")},
- &pb2.Nested{OptString: scalar.String("two")},
- &pb2.Nested{OptString: scalar.String("three")},
+ &pb2.Nested{OptString: proto.String("one")},
+ &pb2.Nested{OptString: proto.String("two")},
+ &pb2.Nested{OptString: proto.String("three")},
})
return m
}(),
@@ -1297,13 +1296,13 @@
wantMessage: func() proto.Message {
m := &pb2.MessageSet{}
setExtension(m, pb2.E_MessageSetExtension_MessageSetExtension, &pb2.MessageSetExtension{
- OptString: scalar.String("a messageset extension"),
+ OptString: proto.String("a messageset extension"),
})
setExtension(m, pb2.E_MessageSetExtension_NotMessageSetExtension, &pb2.MessageSetExtension{
- OptString: scalar.String("not a messageset extension"),
+ OptString: proto.String("not a messageset extension"),
})
setExtension(m, pb2.E_MessageSetExtension_ExtNested, &pb2.Nested{
- OptString: scalar.String("just a regular extension"),
+ OptString: proto.String("just a regular extension"),
})
return m
}(),
@@ -1318,7 +1317,7 @@
wantMessage: func() proto.Message {
m := &pb2.FakeMessageSet{}
setExtension(m, pb2.E_FakeMessageSetExtension_MessageSetExtension, &pb2.FakeMessageSetExtension{
- OptString: scalar.String("not a messageset extension"),
+ OptString: proto.String("not a messageset extension"),
})
return m
}(),
@@ -1341,7 +1340,7 @@
wantMessage: func() proto.Message {
m := &pb2.MessageSet{}
setExtension(m, pb2.E_MessageSetExtension, &pb2.FakeMessageSetExtension{
- OptString: scalar.String("another not a messageset extension"),
+ OptString: proto.String("another not a messageset extension"),
})
return m
}(),
@@ -1386,9 +1385,9 @@
`,
wantMessage: func() proto.Message {
m := &pb2.Nested{
- OptString: scalar.String("embedded inside Any"),
+ OptString: proto.String("embedded inside Any"),
OptNested: &pb2.Nested{
- OptString: scalar.String("inception"),
+ OptString: proto.String("inception"),
},
}
b, err := proto.MarshalOptions{Deterministic: true}.Marshal(m)
@@ -1423,7 +1422,7 @@
`,
wantMessage: func() proto.Message {
m := &pb2.PartialRequired{
- OptString: scalar.String("embedded inside Any"),
+ OptString: proto.String("embedded inside Any"),
}
b, err := proto.MarshalOptions{
AllowPartial: true,