internal/scalar: add scalar package for primitive wrappers
Add the scalar package to reduce dependencies on the v1 proto runtime package.
It may very well be the case that these functions should be exposed in the
public API of v2, but that is not a decision we need to make now.
Change-Id: Ifbc6d15311ba5837909ac72af47c630a80a142ef
Reviewed-on: https://go-review.googlesource.com/c/151402
Reviewed-by: Herbie Ong <herbie@google.com>
diff --git a/protogen/protogen_test.go b/protogen/protogen_test.go
index a61c18b..b098845 100644
--- a/protogen/protogen_test.go
+++ b/protogen/protogen_test.go
@@ -19,6 +19,7 @@
"github.com/golang/protobuf/proto"
descpb "github.com/golang/protobuf/protoc-gen-go/descriptor"
pluginpb "github.com/golang/protobuf/protoc-gen-go/plugin"
+ "github.com/golang/protobuf/v2/internal/scalar"
)
func TestPluginParameters(t *testing.T) {
@@ -29,7 +30,7 @@
}
const params = "integer=2"
_, err := New(&pluginpb.CodeGeneratorRequest{
- Parameter: proto.String(params),
+ Parameter: scalar.String(params),
}, opts)
if err != nil {
t.Errorf("New(generator parameters %q): %v", params, err)
@@ -50,7 +51,7 @@
ParamFunc: flags.Set,
}
_, err := New(&pluginpb.CodeGeneratorRequest{
- Parameter: proto.String(parameter),
+ Parameter: scalar.String(parameter),
}, opts)
if err == nil {
t.Errorf("New(generator parameters %q): want error, got nil", parameter)
@@ -170,13 +171,13 @@
test.desc, test.parameter, filename, test.generate, test.goPackageOption)
req := &pluginpb.CodeGeneratorRequest{
- Parameter: proto.String(test.parameter),
+ Parameter: scalar.String(test.parameter),
ProtoFile: []*descpb.FileDescriptorProto{
{
- Name: proto.String(filename),
- Package: proto.String(protoPackageName),
+ Name: scalar.String(filename),
+ Package: scalar.String(protoPackageName),
Options: &descpb.FileOptions{
- GoPackage: proto.String(test.goPackageOption),
+ GoPackage: scalar.String(test.goPackageOption),
},
},
},
@@ -210,14 +211,14 @@
gen, err := New(&pluginpb.CodeGeneratorRequest{
ProtoFile: []*descpb.FileDescriptorProto{
{
- Name: proto.String("dir/file1.proto"),
- Package: proto.String("proto.package"),
+ Name: scalar.String("dir/file1.proto"),
+ Package: scalar.String("proto.package"),
},
{
- Name: proto.String("dir/file2.proto"),
- Package: proto.String("proto.package"),
+ Name: scalar.String("dir/file2.proto"),
+ Package: scalar.String("proto.package"),
Options: &descpb.FileOptions{
- GoPackage: proto.String("foo"),
+ GoPackage: scalar.String("foo"),
},
},
},
@@ -237,17 +238,17 @@
_, err := New(&pluginpb.CodeGeneratorRequest{
ProtoFile: []*descpb.FileDescriptorProto{
{
- Name: proto.String("dir/file1.proto"),
- Package: proto.String("proto.package"),
+ Name: scalar.String("dir/file1.proto"),
+ Package: scalar.String("proto.package"),
Options: &descpb.FileOptions{
- GoPackage: proto.String("golang.org/x/foo"),
+ GoPackage: scalar.String("golang.org/x/foo"),
},
},
{
- Name: proto.String("dir/file2.proto"),
- Package: proto.String("proto.package"),
+ Name: scalar.String("dir/file2.proto"),
+ Package: scalar.String("proto.package"),
Options: &descpb.FileOptions{
- GoPackage: proto.String("golang.org/x/foo;bar"),
+ GoPackage: scalar.String("golang.org/x/foo;bar"),
},
},
},