Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update github-golangci-lint to 1.56.0 from 1.55.2 #866

Merged
merged 1 commit into from
Feb 7, 2024
Merged

Update github-golangci-lint to 1.56.0 from 1.55.2 #866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
pull_request:

env:
GOLANGCILINT_VERSION: "1.55.2"
GOLANGCILINT_VERSION: "1.56.0"

jobs:
lint:
Expand Down
2 changes: 1 addition & 1 deletion pkg/cli/cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ func Main(r *interp.Registry, version string) {
}

if err := i.Main(context.Background(), sos.Stdout(), version); err != nil {
if ex, ok := err.(interp.Exiter); ok { //nolint:errorlint
if ex, ok := err.(interp.Exiter); ok {
return ex.ExitCode()
}
return 1
Expand Down
2 changes: 1 addition & 1 deletion pkg/fqtest/fqtest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func TestPath(t *testing.T, registry *interp.Registry, update bool) {

err = i.Main(context.Background(), cr.Stdout(), "testversion")
if err != nil {
if ex, ok := err.(interp.Exiter); ok { //nolint:errorlint
if ex, ok := err.(interp.Exiter); ok {
cr.ActualExitCode = ex.ExitCode()
}
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/interp/interp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ func toBytes(v any) ([]byte, error) {
func queryErrorPosition(expr string, v error) pos.Pos {
var offset int

if tokIf, ok := v.(interface{ Token() (string, int) }); ok { //nolint:errorlint
if tokIf, ok := v.(interface{ Token() (string, int) }); ok {
_, offset = tokIf.Token()
}
if offset >= 0 {
Expand Down Expand Up @@ -403,7 +403,7 @@ func (i *Interp) Main(ctx context.Context, output Output, versionStr string) err

switch v := v.(type) {
case error:
if emptyErr, ok := v.(IsEmptyErrorer); ok && emptyErr.IsEmptyError() { //nolint:errorlint
if emptyErr, ok := v.(IsEmptyErrorer); ok && emptyErr.IsEmptyError() {
// no output
} else if errors.Is(v, context.Canceled) {
// ignore context cancel here for now, which means user somehow interrupted the interpreter
Expand Down
Loading