larryh/corso
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Just use errors package for portability

Browse Source
This commit is contained in:
Ashlie Martinez 2023-03-31 12:41:17 -07:00
parent e02cbfdb73
commit e3dbbc546a
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/cmd/jsondebug/decoder/decoder.go
View File

@ -2,10 +2,9 @@ package decoder
import ( import (
"encoding/json" "encoding/json"
"fmt"
"io" "io"
"github.com/alcionai/clues" "github.com/pkg/errors"
"github.com/alcionai/corso/src/cmd/jsondebug/common" "github.com/alcionai/corso/src/cmd/jsondebug/common"
) )
@ -17,25 +16,25 @@ const (
arrayClose = "]" arrayClose = "]"
) )
var errEOF = clues.New("unexpected end of input") var errEOF = errors.New("unexpected end of input")
func expectDelimToken(dec *json.Decoder, expectedToken string) error { func expectDelimToken(dec *json.Decoder, expectedToken string) error {
t, err := dec.Token() t, err := dec.Token()
if err == io.EOF { if err == io.EOF {
return clues.Wrap(errEOF, "") return errors.WithStack(errEOF)
} else if err != nil { } else if err != nil {
return clues.Wrap(err, "reading JSON token") return errors.Wrap(err, "reading JSON token")
} }
d, ok := t.(json.Delim) d, ok := t.(json.Delim)
if !ok { if !ok {
return clues.New(fmt.Sprintf("unexpected token: (%T) %v", t, t)) return errors.Errorf("unexpected token: (%T) %v", t, t)
} else if d.String() != expectedToken { } else if d.String() != expectedToken {
return clues.New(fmt.Sprintf( return errors.Errorf(
"unexpected token; wanted %s, got %s", "unexpected token; wanted %s, got %s",
expectedToken, expectedToken,
d, d,
)) )
} }
return nil return nil
@ -67,24 +66,24 @@ func parseFields(dec *json.Decoder, res *common.FooArray) error {
for dec.More() { for dec.More() {
t, err := dec.Token() t, err := dec.Token()
if err == io.EOF { if err == io.EOF {
return clues.Wrap(errEOF, "") return errors.WithStack(errEOF)
} else if err != nil { } else if err != nil {
return clues.Wrap(err, "reading JSON token") return errors.Wrap(err, "reading JSON token")
} }
l, ok := t.(string) l, ok := t.(string)
if !ok { if !ok {
return clues.New(fmt.Sprintf( return errors.Errorf(
"unexpected token (%T) %v; wanted field name", "unexpected token (%T) %v; wanted field name",
t, t,
t, t,
)) )
} }
// Only have `entries` field right now. Needs to match the JSON tag for the // Only have `entries` field right now. Needs to match the JSON tag for the
// struct. // struct.
if l != "entries" { if l != "entries" {
return clues.New(fmt.Sprintf("unexpected field name %s", l)) return errors.Errorf("unexpected field name %s", l)
} }
if err = decodeArray(dec, &res.Entries); err != nil { if err = decodeArray(dec, &res.Entries); err != nil {
@ -105,7 +104,7 @@ func decodeArray[T any](dec *json.Decoder, output *[]T) error {
for dec.More() { for dec.More() {
tmp := *new(T) tmp := *new(T)
if err := dec.Decode(&tmp); err != nil { if err := dec.Decode(&tmp); err != nil {
return clues.Wrap(err, "decoding array element") return errors.Wrap(err, "decoding array element")
} }
*output = append(*output, tmp) *output = append(*output, tmp)