From cc7a46d545092121edd2abff592d1ed704809aa8 Mon Sep 17 00:00:00 2001 From: Denis Bilenko Date: Tue, 10 Dec 2024 11:16:45 +0100 Subject: [PATCH] keep ignoring errors that were ignored before --- libs/dyn/convert/from_typed.go | 10 ++++------ libs/dyn/jsonloader/json.go | 5 ++--- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/libs/dyn/convert/from_typed.go b/libs/dyn/convert/from_typed.go index 3d54e9d5d..905c5a442 100644 --- a/libs/dyn/convert/from_typed.go +++ b/libs/dyn/convert/from_typed.go @@ -126,9 +126,8 @@ func fromTypedStruct(src reflect.Value, ref dyn.Value, options ...fromTypedOptio // Either if the key was set in the reference or the field is not zero-valued, we include it. if ok || nv.Kind() != dyn.KindNil { - if err := out.Set(refk, nv); err != nil { - return dyn.InvalidValue, err - } + // QQQ log error? + _ = out.Set(refk, nv) } } @@ -186,9 +185,8 @@ func fromTypedMap(src reflect.Value, ref dyn.Value) (dyn.Value, error) { // Every entry is represented, even if it is a nil. // Otherwise, a map with zero-valued structs would yield a nil as well. - if err := out.Set(refk, nv); err != nil { - return dyn.InvalidValue, err - } + // QQQ log error? + _ = out.Set(refk, nv) } return dyn.V(out), nil diff --git a/libs/dyn/jsonloader/json.go b/libs/dyn/jsonloader/json.go index 39d1c51ba..3036596be 100644 --- a/libs/dyn/jsonloader/json.go +++ b/libs/dyn/jsonloader/json.go @@ -70,9 +70,8 @@ func decodeValue(decoder *json.Decoder, o *Offset) (dyn.Value, error) { return invalidValueWithLocation(decoder, o), err } - if err := obj.Set(keyVal, val); err != nil { - return invalidValueWithLocation(decoder, o), err - } + // QQQ log this? + _ = obj.Set(keyVal, val) } // Consume the closing '}' if _, err := decoder.Token(); err != nil {