Update dependencies
This commit is contained in:
parent
0d085a2b4d
commit
2a72b198e3
84 changed files with 1461 additions and 980 deletions
3
vendor/google.golang.org/protobuf/proto/merge.go
generated
vendored
3
vendor/google.golang.org/protobuf/proto/merge.go
generated
vendored
|
@ -21,6 +21,9 @@ import (
|
|||
// It is semantically equivalent to unmarshaling the encoded form of src
|
||||
// into dst with the UnmarshalOptions.Merge option specified.
|
||||
func Merge(dst, src Message) {
|
||||
// TODO: Should nil src be treated as semantically equivalent to a
|
||||
// untyped, read-only, empty message? What about a nil dst?
|
||||
|
||||
dstMsg, srcMsg := dst.ProtoReflect(), src.ProtoReflect()
|
||||
if dstMsg.Descriptor() != srcMsg.Descriptor() {
|
||||
panic("descriptor mismatch")
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue