summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@lukeshu.com>2023-01-26 23:44:53 -0700
committerLuke Shumaker <lukeshu@lukeshu.com>2023-01-29 02:14:51 -0700
commit0616a12019eb3220d437b02a30483720477f14a0 (patch)
tree6073f186d95a0068f53fe09473f467c78582bba0
parent690b0cbb2a220ef4179a0f9f34725328fb8c73f8 (diff)
.golangci.yml: Turn on 'nakedret', fix
-rw-r--r--.golangci.yml1
-rw-r--r--decode.go2
2 files changed, 1 insertions, 2 deletions
diff --git a/.golangci.yml b/.golangci.yml
index cc094f1..cadb81b 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -54,7 +54,6 @@ linters:
- gomnd
- ireturn
- lll
- - nakedret
- noctx
- paralleltest
- prealloc
diff --git a/decode.go b/decode.go
index 0b5b6cc..f237b2b 100644
--- a/decode.go
+++ b/decode.go
@@ -860,7 +860,7 @@ func DecodeObject(r io.RuneScanner, decodeKey, decodeVal func(io.RuneScanner) er
dec.panicType(t.JSONType(), nil, fmt.Errorf("did not consume entire %s", t.JSONType()))
}
})
- return
+ return err
}
func (dec *Decoder) decodeObject(gTyp reflect.Type, decodeKey, decodeVal func()) {