From ecad63354da824f868c6bf959bd2b64d1adc200a Mon Sep 17 00:00:00 2001 From: Jens Rantil Date: Tue, 25 Dec 2018 14:30:42 +0100 Subject: [PATCH] ref(decoding): simplify conditional branch ...by moving out common code. --- reflect_struct_decoder.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/reflect_struct_decoder.go b/reflect_struct_decoder.go index 355d2d11..b372fda1 100644 --- a/reflect_struct_decoder.go +++ b/reflect_struct_decoder.go @@ -519,16 +519,15 @@ func (decoder *generalStructDecoder) decodeOneField(ptr unsafe.Pointer, iter *It fieldBytes := iter.ReadStringAsSlice() field = *(*string)(unsafe.Pointer(&fieldBytes)) fieldDecoder = decoder.fields[field] - if fieldDecoder == nil && !iter.cfg.caseSensitive { - fieldDecoder = decoder.fields[strings.ToLower(field)] - } } else { field = iter.ReadString() fieldDecoder = decoder.fields[field] - if fieldDecoder == nil && !iter.cfg.caseSensitive { - fieldDecoder = decoder.fields[strings.ToLower(field)] - } } + + if fieldDecoder == nil && !iter.cfg.caseSensitive { + fieldDecoder = decoder.fields[strings.ToLower(field)] + } + if fieldDecoder == nil { msg := "found unknown field: " + field if decoder.disallowUnknownFields {