suyiiyii/yq
1
0
Fork 0
mirror of https://github.com/mikefarah/yq.git synced 2024-12-19 20:19:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplified json error check

Browse Source
This commit is contained in:
Mike Farah 2022-11-11 09:50:22 +11:00
parent 3435fee1f9
commit c5994a8b28
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/yqlib/encoder.go
View File

@ -45,11 +45,7 @@ func (o *orderedMap) UnmarshalJSON(data []byte) error {
// cycle through k/v // cycle through k/v
var tok json.Token var tok json.Token
for tok, err = dec.Token(); !errors.Is(err, io.EOF); tok, err = dec.Token() { for tok, err = dec.Token(); err == nil; tok, err = dec.Token() {
if err != nil && !errors.Is(err, io.EOF) {
return err
}
// we can expect two types: string or Delim. Delim automatically means // we can expect two types: string or Delim. Delim automatically means
// that it is the closing bracket of the object, whereas string means // that it is the closing bracket of the object, whereas string means
// that there is another key. // that there is another key.