forked from toolshed/abra
chore: make deps, go mod vendor
This commit is contained in:
2
vendor/google.golang.org/protobuf/encoding/protojson/decode.go
generated
vendored
2
vendor/google.golang.org/protobuf/encoding/protojson/decode.go
generated
vendored
@ -351,7 +351,7 @@ func (d decoder) unmarshalScalar(fd protoreflect.FieldDescriptor) (protoreflect.
|
||||
panic(fmt.Sprintf("unmarshalScalar: invalid scalar kind %v", kind))
|
||||
}
|
||||
|
||||
return protoreflect.Value{}, d.newError(tok.Pos(), "invalid value for %v type: %v", kind, tok.RawString())
|
||||
return protoreflect.Value{}, d.newError(tok.Pos(), "invalid value for %v field %v: %v", kind, fd.JSONName(), tok.RawString())
|
||||
}
|
||||
|
||||
func unmarshalInt(tok json.Token, bitSize int) (protoreflect.Value, bool) {
|
||||
|
4
vendor/google.golang.org/protobuf/encoding/protojson/encode.go
generated
vendored
4
vendor/google.golang.org/protobuf/encoding/protojson/encode.go
generated
vendored
@ -216,9 +216,7 @@ func (m unpopulatedFieldRanger) Range(f func(protoreflect.FieldDescriptor, proto
|
||||
}
|
||||
|
||||
v := m.Get(fd)
|
||||
isProto2Scalar := fd.Syntax() == protoreflect.Proto2 && fd.Default().IsValid()
|
||||
isSingularMessage := fd.Cardinality() != protoreflect.Repeated && fd.Message() != nil
|
||||
if isProto2Scalar || isSingularMessage {
|
||||
if fd.HasPresence() {
|
||||
if m.skipNull {
|
||||
continue
|
||||
}
|
||||
|
6
vendor/google.golang.org/protobuf/encoding/protojson/well_known_types.go
generated
vendored
6
vendor/google.golang.org/protobuf/encoding/protojson/well_known_types.go
generated
vendored
@ -348,7 +348,11 @@ func (d decoder) unmarshalAnyValue(unmarshal unmarshalFunc, m protoreflect.Messa
|
||||
switch tok.Kind() {
|
||||
case json.ObjectClose:
|
||||
if !found {
|
||||
return d.newError(tok.Pos(), `missing "value" field`)
|
||||
// We tolerate an omitted `value` field with the google.protobuf.Empty Well-Known-Type,
|
||||
// for compatibility with other proto runtimes that have interpreted the spec differently.
|
||||
if m.Descriptor().FullName() != genid.Empty_message_fullname {
|
||||
return d.newError(tok.Pos(), `missing "value" field`)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
|
||||
|
Reference in New Issue
Block a user