Skip to content

Commit

Permalink
fix: Add context errors as allowed direct comparisons (#63)
Browse files Browse the repository at this point in the history
  • Loading branch information
jkz-stripe authored Dec 5, 2023
1 parent 679f044 commit 2175ff4
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 0 deletions.
3 changes: 3 additions & 0 deletions errorlint/allowed.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ var allowedErrors = []struct {
{err: "io.EOF", fun: "(*strings.Reader).ReadAt"},
{err: "io.EOF", fun: "(*strings.Reader).ReadByte"},
{err: "io.EOF", fun: "(*strings.Reader).ReadRune"},
// pkg/context
{err: "context.DeadlineExceeded", fun: "(context.Context).Err"},
{err: "context.Canceled", fun: "(context.Context).Err"},
}

var allowedErrorWildcards = []struct {
Expand Down
11 changes: 11 additions & 0 deletions errorlint/testdata/src/allowed/allowed.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package testdata
import (
"archive/tar"
"bytes"
"context"
"database/sql"
"debug/elf"
"errors"
Expand Down Expand Up @@ -227,3 +228,13 @@ func CompareUnixErrors() {
fmt.Println(err)
}
}

func ContextErr(ctx context.Context) error {
if err := ctx.Err(); err == context.DeadlineExceeded {
return err
}
if err := ctx.Err(); err == context.Canceled {
return err
}
return nil
}

0 comments on commit 2175ff4

Please sign in to comment.