Skip to content

Commit

Permalink
appease linter
Browse files Browse the repository at this point in the history
  • Loading branch information
lestrrat committed Feb 15, 2021
1 parent 2f33575 commit d0944e1
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 13 deletions.
12 changes: 6 additions & 6 deletions internal/json/registry.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ func (r *Registry) Decode(dec *Decoder, name string) (interface{}, error) {
return nil, errors.Wrapf(err, `failed to decode field %s`, name)
}
return reflect.ValueOf(ptr).Elem().Interface(), nil
} else {
var decoded interface{}
if err := dec.Decode(&decoded); err != nil {
return nil, errors.Wrapf(err, `failed to decode field %s`, name)
}
return decoded, nil
}

var decoded interface{}
if err := dec.Decode(&decoded); err != nil {
return nil, errors.Wrapf(err, `failed to decode field %s`, name)
}
return decoded, nil
}
1 change: 0 additions & 1 deletion jwk/jwk.go
Original file line number Diff line number Diff line change
Expand Up @@ -601,4 +601,3 @@ func asnEncode(key Key) (string, []byte, error) {
func RegisterCustomField(name string, object interface{}) {
registry.Register(name, object)
}

10 changes: 5 additions & 5 deletions jws/internal/cmd/genheader/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -429,11 +429,11 @@ func generateHeaders() error {
}
}
fmt.Fprintf(&buf, "\ndefault:")
fmt.Fprintf(&buf, "\ndecoded, err := registry.Decode(dec, tok)")
fmt.Fprintf(&buf, "\nif err != nil {")
fmt.Fprintf(&buf, "\nreturn err")
fmt.Fprintf(&buf, "\n}")
fmt.Fprintf(&buf, "\nh.setNoLock(tok, decoded)")
fmt.Fprintf(&buf, "\ndecoded, err := registry.Decode(dec, tok)")
fmt.Fprintf(&buf, "\nif err != nil {")
fmt.Fprintf(&buf, "\nreturn err")
fmt.Fprintf(&buf, "\n}")
fmt.Fprintf(&buf, "\nh.setNoLock(tok, decoded)")
fmt.Fprintf(&buf, "\n}")
fmt.Fprintf(&buf, "\ndefault:")
fmt.Fprintf(&buf, "\nreturn errors.Errorf(`invalid token %%T`, tok)")
Expand Down
1 change: 0 additions & 1 deletion jws/jws.go
Original file line number Diff line number Diff line change
Expand Up @@ -556,4 +556,3 @@ func parse(protected, payload, signature []byte) (*Message, error) {
func RegisterCustomField(name string, object interface{}) {
registry.Register(name, object)
}

0 comments on commit d0944e1

Please sign in to comment.