Skip to content

Commit ea4d746

Browse files
authored
Use any instead of interface{} (#145)
1 parent 8c3ca01 commit ea4d746

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

algo_hs.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func newHS(alg Algorithm, key []byte) (*HSAlg, error) {
3030
hash: hash,
3131
key: key,
3232
hashPool: &sync.Pool{
33-
New: func() interface{} {
33+
New: func() any {
3434
return hmac.New(hash.New, key)
3535
},
3636
},

audience.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func (a Audience) MarshalJSON() ([]byte, error) {
2020

2121
// UnmarshalJSON implements json.Unmarshaler interface.
2222
func (a *Audience) UnmarshalJSON(b []byte) error {
23-
var v interface{}
23+
var v any
2424
if err := json.Unmarshal(b, &v); err != nil {
2525
return ErrAudienceInvalidFormat
2626
}
@@ -29,7 +29,7 @@ func (a *Audience) UnmarshalJSON(b []byte) error {
2929
case string:
3030
*a = Audience{v}
3131
return nil
32-
case []interface{}:
32+
case []any:
3333
aud := make(Audience, len(v))
3434
for i := range v {
3535
v, ok := v[i].(string)

build.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func NewBuilder(signer Signer, opts ...BuilderOption) *Builder {
4747
// Build used to create and encode JWT with a provided claims.
4848
// If claims param is of type []byte or string then it's treated as a marshaled JSON.
4949
// In other words you can pass already marshaled claims.
50-
func (b *Builder) Build(claims interface{}) (*Token, error) {
50+
func (b *Builder) Build(claims any) (*Token, error) {
5151
rawClaims, err := encodeClaims(claims)
5252
if err != nil {
5353
return nil, err
@@ -89,7 +89,7 @@ func (b *Builder) Build(claims interface{}) (*Token, error) {
8989
return t, nil
9090
}
9191

92-
func encodeClaims(claims interface{}) ([]byte, error) {
92+
func encodeClaims(claims any) ([]byte, error) {
9393
switch claims := claims.(type) {
9494
case []byte:
9595
return claims, nil

build_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
)
88

99
func TestBuild(t *testing.T) {
10-
f := func(signer Signer, verifier Verifier, claims interface{}) {
10+
f := func(signer Signer, verifier Verifier, claims any) {
1111
t.Helper()
1212

1313
token, err := NewBuilder(signer).Build(claims)
@@ -163,7 +163,7 @@ func TestBuildClaims(t *testing.T) {
163163
s := mustSigner(NewSignerHS(HS256, key))
164164
v := mustVerifier(NewVerifierHS(HS256, key))
165165

166-
f := func(claims interface{}, want string) {
166+
f := func(claims any, want string) {
167167
token, err := NewBuilder(s).Build(claims)
168168
if err != nil {
169169
t.Fatal(err)
@@ -208,7 +208,7 @@ func TestBuildClaims(t *testing.T) {
208208
}
209209

210210
func TestBuildMalformed(t *testing.T) {
211-
f := func(signer Signer, claims interface{}) {
211+
f := func(signer Signer, claims any) {
212212
t.Helper()
213213

214214
_, err := NewBuilder(signer).Build(claims)

jwt.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func (t *Token) Claims() json.RawMessage {
5656
}
5757

5858
// DecodeClaims into a given parameter.
59-
func (t *Token) DecodeClaims(dst interface{}) error {
59+
func (t *Token) DecodeClaims(dst any) error {
6060
return json.Unmarshal(t.claims, dst)
6161
}
6262

jwt_bench_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,6 @@ func runVerifyBench(b *testing.B, builder *jwt.Builder, verifier jwt.Verifier) {
193193
sink(dummy)
194194
}
195195

196-
func sink(v interface{}) {
196+
func sink(v any) {
197197
fmt.Fprint(io.Discard, v)
198198
}

parse.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ func Parse(raw []byte, verifier Verifier) (*Token, error) {
1919
}
2020

2121
// ParseClaims decodes a token claims and verifies it's signature.
22-
func ParseClaims(raw []byte, verifier Verifier, claims interface{}) error {
22+
func ParseClaims(raw []byte, verifier Verifier, claims any) error {
2323
token, err := Parse(raw, verifier)
2424
if err != nil {
2525
return err

0 commit comments

Comments
 (0)