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/impl/legacy_test.go b/internal/impl/legacy_test.go
index 1c758d2..d22b3d8 100644
--- a/internal/impl/legacy_test.go
+++ b/internal/impl/legacy_test.go
@@ -15,7 +15,6 @@
"google.golang.org/protobuf/encoding/prototext"
pimpl "google.golang.org/protobuf/internal/impl"
"google.golang.org/protobuf/internal/pragma"
- "google.golang.org/protobuf/internal/scalar"
"google.golang.org/protobuf/proto"
pdesc "google.golang.org/protobuf/reflect/protodesc"
pref "google.golang.org/protobuf/reflect/protoreflect"
@@ -375,8 +374,8 @@
}
// Set some values and append to values to the lists.
- m1a := &proto2_20180125.Message_ChildMessage{F1: scalar.String("m1a")}
- m1b := &proto2_20180125.Message_ChildMessage{F1: scalar.String("m2b")}
+ m1a := &proto2_20180125.Message_ChildMessage{F1: proto.String("m1a")}
+ m1b := &proto2_20180125.Message_ChildMessage{F1: proto.String("m2b")}
m2a := &EnumMessages{EnumP2: EnumProto2(0x1b).Enum()}
m2b := &EnumMessages{EnumP2: EnumProto2(0x2b).Enum()}
setValues := map[int]interface{}{