Merge branch 'mergelibs12' into main

2 files changed, 8 insertions, 6 deletions

diff --git a/vendor/google.golang.org/protobuf/protoadapt/convert.go b/vendor/google.golang.org/protobuf/protoadapt/convert.go
index ce172386bf..ea276d15a0 100644
--- a/vendor/google.golang.org/protobuf/protoadapt/convert.go
+++ b/vendor/google.golang.org/protobuf/protoadapt/convert.go
@@ -11,21 +11,21 @@ import (
 	"google.golang.org/protobuf/runtime/protoimpl"
 )
 
-// MessageV1 is the original "github.com/golang/protobuf/proto".Message type.
+// MessageV1 is the original [github.com/golang/protobuf/proto.Message] type.
 type MessageV1 = protoiface.MessageV1
 
-// MessageV2 is the Message type used by the current google.golang.org/protobuf
-// module, adding support for reflection.
+// MessageV2 is the [google.golang.org/protobuf/proto.Message] type used by the
+// current [google.golang.org/protobuf] module, adding support for reflection.
 type MessageV2 = proto.Message
 
 // MessageV1Of converts a v2 message to a v1 message.
 // It returns nil if m is nil.
-func MessageV1Of(m MessageV2) protoiface.MessageV1 {
+func MessageV1Of(m MessageV2) MessageV1 {
 	return protoimpl.X.ProtoMessageV1Of(m)
 }
 
 // MessageV2Of converts a v1 message to a v2 message.
 // It returns nil if m is nil.
-func MessageV2Of(m MessageV1) proto.Message {
+func MessageV2Of(m MessageV1) MessageV2 {
 	return protoimpl.X.ProtoMessageV2Of(m)
 }
diff --git a/vendor/google.golang.org/protobuf/protoadapt/ya.make b/vendor/google.golang.org/protobuf/protoadapt/ya.make
index cc365bd76b..e122057c6c 100644
--- a/vendor/google.golang.org/protobuf/protoadapt/ya.make
+++ b/vendor/google.golang.org/protobuf/protoadapt/ya.make
@@ -2,6 +2,8 @@ GO_LIBRARY()
 
 LICENSE(BSD-3-Clause)
 
-SRCS(convert.go)
+SRCS(
+    convert.go
+)
 
 END()