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/internal/cmd/pbdump/pbdump.go b/internal/cmd/pbdump/pbdump.go
index 98a36eb..71912b1 100644
--- a/internal/cmd/pbdump/pbdump.go
+++ b/internal/cmd/pbdump/pbdump.go
@@ -19,7 +19,7 @@
"google.golang.org/protobuf/internal/encoding/pack"
"google.golang.org/protobuf/internal/encoding/wire"
- "google.golang.org/protobuf/internal/scalar"
+ "google.golang.org/protobuf/proto"
"google.golang.org/protobuf/reflect/protodesc"
"google.golang.org/protobuf/reflect/protoreflect"
@@ -203,8 +203,8 @@
// Descriptor returns the field tree as a message descriptor.
func (fs fields) Descriptor() (protoreflect.MessageDescriptor, error) {
fd, err := protodesc.NewFile(&descriptorpb.FileDescriptorProto{
- Name: scalar.String("dump.proto"),
- Syntax: scalar.String("proto2"),
+ Name: proto.String("dump.proto"),
+ Syntax: proto.String("proto2"),
MessageType: []*descriptorpb.DescriptorProto{fs.messageDescriptor("X")},
}, nil)
if err != nil {
@@ -213,15 +213,15 @@
return fd.Messages().Get(0), nil
}
func (fs fields) messageDescriptor(name protoreflect.FullName) *descriptorpb.DescriptorProto {
- m := &descriptorpb.DescriptorProto{Name: scalar.String(string(name.Name()))}
+ m := &descriptorpb.DescriptorProto{Name: proto.String(string(name.Name()))}
for _, n := range fs.sortedNums() {
k := fs[n].kind
if !k.IsValid() {
k = protoreflect.MessageKind
}
f := &descriptorpb.FieldDescriptorProto{
- Name: scalar.String(fmt.Sprintf("x%d", n)),
- Number: scalar.Int32(int32(n)),
+ Name: proto.String(fmt.Sprintf("x%d", n)),
+ Number: proto.Int32(int32(n)),
Label: descriptorpb.FieldDescriptorProto_LABEL_OPTIONAL.Enum(),
Type: descriptorpb.FieldDescriptorProto_Type(k).Enum(),
}
@@ -232,10 +232,10 @@
protoreflect.Sfixed32Kind, protoreflect.Fixed32Kind, protoreflect.FloatKind,
protoreflect.Sfixed64Kind, protoreflect.Fixed64Kind, protoreflect.DoubleKind:
f.Label = descriptorpb.FieldDescriptorProto_LABEL_REPEATED.Enum()
- f.Options = &descriptorpb.FieldOptions{Packed: scalar.Bool(true)}
+ f.Options = &descriptorpb.FieldOptions{Packed: proto.Bool(true)}
case protoreflect.MessageKind, protoreflect.GroupKind:
s := name.Append(protoreflect.Name(fmt.Sprintf("X%d", n)))
- f.TypeName = scalar.String(string("." + s))
+ f.TypeName = proto.String(string("." + s))
m.NestedType = append(m.NestedType, fs[n].sub.messageDescriptor(s))
}
m.Field = append(m.Field, f)