Skip to content

Commit 0fd87f0

Browse files
committed
internal/proto: avoid deprecated protoregistry APIs
Switch from the deprecated Register methods to the type-specific RegisterFile, RegisterMessage, and RegisterExtension. Drop usage of the deprecated NewTypes function. Change-Id: I547e77ef1b8ea1c039227b656ea6ba85c3536dd1 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/205700 Reviewed-by: Joe Tsai <[email protected]>
1 parent e1cc4b5 commit 0fd87f0

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

internal/proto/registry.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func RegisterFile(s filePath, d fileDescGZIP) {
6565
}
6666

6767
// Register the descriptor in the v2 registry and cache the result locally.
68-
if err := protoregistry.GlobalFiles.Register(fd); err != nil {
68+
if err := protoregistry.GlobalFiles.RegisterFile(fd); err != nil {
6969
printWarning(err)
7070
return
7171
}
@@ -249,7 +249,7 @@ func RegisterType(m Message, s messageName) {
249249
if s != messageName(mt.Descriptor().FullName()) {
250250
panic(fmt.Sprintf("proto: inconsistent message name: got %v, want %v", s, mt.Descriptor().FullName()))
251251
}
252-
if err := protoregistry.GlobalTypes.Register(mt); err != nil {
252+
if err := protoregistry.GlobalTypes.RegisterMessage(mt); err != nil {
253253
printWarning(err)
254254
return
255255
}
@@ -312,7 +312,7 @@ func MessageName(m Message) messageName {
312312
//
313313
// Deprecated: Use protoregistry.GlobalTypes.Register instead.
314314
func RegisterExtension(d *ExtensionDesc) {
315-
if err := protoregistry.GlobalTypes.Register(d); err != nil {
315+
if err := protoregistry.GlobalTypes.RegisterExtension(d); err != nil {
316316
panic(err)
317317
}
318318
}

internal/proto/text.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func (tm *TextMarshaler) Text(pb Message) string {
7777
}
7878

7979
var (
80-
emptyResolver = preg.NewTypes()
80+
emptyResolver = &preg.Types{}
8181
defaultTextMarshaler = TextMarshaler{}
8282
compactTextMarshaler = TextMarshaler{Compact: true}
8383
)

0 commit comments

Comments
 (0)