From 28a15a7840f8e33437ab6721f14124f25965b191 Mon Sep 17 00:00:00 2001 From: Anton Telyshev Date: Sun, 21 Apr 2024 19:06:08 +0300 Subject: [PATCH] Testing of Go 1.22 (#30) --- .github/workflows/ci.yml | 4 ++-- go.mod | 7 +++++-- go.sum | 11 ++++++----- pkg/analyzer/testdata/src/examples/issue29.go | 19 +++++++++++++++++++ 4 files changed, 32 insertions(+), 9 deletions(-) create mode 100644 pkg/analyzer/testdata/src/examples/issue29.go diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 35e24dc..43fca68 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,8 +8,8 @@ on: branches: [ master ] env: - GO_VERSION: ^1.20 - GOLANGCI_LINT_VERSION: v1.56.2 + GO_VERSION: ^1.22 + GOLANGCI_LINT_VERSION: v1.57.2 permissions: contents: read diff --git a/go.mod b/go.mod index 003d773..c416795 100644 --- a/go.mod +++ b/go.mod @@ -2,6 +2,9 @@ module github.com/Antonboom/nilnil go 1.20 -require golang.org/x/tools v0.19.0 +require golang.org/x/tools v0.20.0 -require golang.org/x/mod v0.16.0 // indirect +require ( + golang.org/x/mod v0.17.0 // indirect + golang.org/x/sync v0.7.0 // indirect +) diff --git a/go.sum b/go.sum index 99fac8c..9e7e462 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,6 @@ -golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic= -golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= -golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= -golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw= -golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc= +golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= +golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= +golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/tools v0.20.0 h1:hz/CVckiOxybQvFw6h7b/q80NTr9IUQb4s1IIzW7KNY= +golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg= diff --git a/pkg/analyzer/testdata/src/examples/issue29.go b/pkg/analyzer/testdata/src/examples/issue29.go new file mode 100644 index 0000000..f9c169f --- /dev/null +++ b/pkg/analyzer/testdata/src/examples/issue29.go @@ -0,0 +1,19 @@ +package examples + +type data struct { + a int + b int +} + +func nilnil(a, b int) (*data, error) { + if a == 0 && b == 0 { + return nil, nil // want "return both the `nil` error and invalid value: use a sentinel error instead" + } + return &data{a: a, b: b}, nil +} + +func main() { + const a = 0 + const b = 0 + _, _ = nilnil(a, b) +}