build(deps): bump github.com/go-critic/go-critic from 0.6.7 to 0.7.0 (golangci#3701)

cristaloleg · SeigeC · commit f7665865702a · 2023-04-04T17:27:42.000+08:00
diff --git a/go.mod b/go.mod
@@ -30,7 +30,7 @@ require (
 	github.com/fatih/color v1.15.0
 	github.com/firefart/nonamedreturns v1.0.4
 	github.com/fzipp/gocyclo v0.6.0
-	github.com/go-critic/go-critic v0.6.7
+	github.com/go-critic/go-critic v0.7.0
 	github.com/go-xmlfmt/xmlfmt v1.1.2
 	github.com/gofrs/flock v0.8.1
 	github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2
@@ -161,7 +161,7 @@ require (
 	github.com/prometheus/procfs v0.7.3 // indirect
 	github.com/quasilyte/go-ruleguard v0.3.19 // indirect
 	github.com/quasilyte/gogrep v0.5.0 // indirect
-	github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95 // indirect
+	github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
 	github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
 	github.com/sivchari/nosnakecase v1.7.0
 	github.com/spf13/afero v1.8.2 // indirect
diff --git a/go.sum b/go.sum
diff --git a/pkg/golinters/gocritic.go b/pkg/golinters/gocritic.go
@@ -13,7 +13,7 @@ import (
 	"sync"
 
 	"github.com/go-critic/go-critic/checkers"
-	gocriticlinter "github.com/go-critic/go-critic/framework/linter"
+	gocriticlinter "github.com/go-critic/go-critic/linter"
 	"golang.org/x/tools/go/analysis"
 
 	"github.com/golangci/golangci-lint/pkg/config"
diff --git a/test/bench/bench_test.go b/test/bench/bench_test.go
@@ -20,18 +20,18 @@ import (
 	"github.com/golangci/golangci-lint/test/testshared"
 )
 
-func chdir(b *testing.B, dir string) {
+func chdir(b testing.TB, dir string) {
 	if err := os.Chdir(dir); err != nil {
 		b.Fatalf("can't chdir to %s: %s", dir, err)
 	}
 }
 
-func prepareGoSource(b *testing.B) {
+func prepareGoSource(b testing.TB) {
 	chdir(b, filepath.Join(build.Default.GOROOT, "src"))
 }
 
-func prepareGithubProject(owner, name string) func(*testing.B) {
-	return func(b *testing.B) {
+func prepareGithubProject(owner, name string) func(testing.TB) {
+	return func(b testing.TB) {
 		dir := filepath.Join(build.Default.GOPATH, "src", "github.com", owner, name)
 		_, err := os.Stat(dir)
 		if os.IsNotExist(err) {
@@ -79,7 +79,7 @@ func getGolangciLintCommonArgs() []string {
 	return []string{"run", "--no-config", "--issues-exit-code=0", "--deadline=30m", "--disable-all", "--enable=govet"}
 }
 
-func runGolangciLintForBench(b *testing.B) {
+func runGolangciLintForBench(b testing.TB) {
 	args := getGolangciLintCommonArgs()
 	args = append(args, getBenchLintersArgs()...)
 	printCommand("golangci-lint", args...)
@@ -180,7 +180,7 @@ type runResult struct {
 	duration  time.Duration
 }
 
-func runOne(b *testing.B, run func(*testing.B), progName string) *runResult {
+func runOne(b *testing.B, run func(testing.TB), progName string) *runResult {
 	doneCh := make(chan struct{})
 	peakMemCh := trackPeakMemoryUsage(b, doneCh, progName)
 	startedAt := time.Now()
@@ -200,7 +200,7 @@ func BenchmarkGolangciLint(b *testing.B) {
 
 	type bcase struct {
 		name    string
-		prepare func(*testing.B)
+		prepare func(testing.TB)
 	}
 	bcases := []bcase{
 		{

-Original file line number
+Diff line change
 	github.com/fatih/color v1.15.0
 	github.com/firefart/nonamedreturns v1.0.4
 	github.com/fzipp/gocyclo v0.6.0
 -	github.com/go-critic/go-critic v0.6.7
 +	github.com/go-critic/go-critic v0.7.0
 	github.com/go-xmlfmt/xmlfmt v1.1.2
 	github.com/gofrs/flock v0.8.1
 	github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2
 	github.com/prometheus/procfs v0.7.3 // indirect
 	github.com/quasilyte/go-ruleguard v0.3.19 // indirect
 	github.com/quasilyte/gogrep v0.5.0 // indirect
 -	github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95 // indirect
 +	github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
 	github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
 	github.com/sivchari/nosnakecase v1.7.0
 	github.com/spf13/afero v1.8.2 // indirect
Original file line number	Diff line number	Diff line change
`@@ -20,18 +20,18 @@ import (`
`20`	`20`	`"github.com/golangci/golangci-lint/test/testshared"`
`21`	`21`	`)`
`22`	`22`
`23`		`-func chdir(b *testing.B, dir string) {`
	`23`	`+func chdir(b testing.TB, dir string) {`
`24`	`24`	`if err := os.Chdir(dir); err != nil {`
`25`	`25`	`b.Fatalf("can't chdir to %s: %s", dir, err)`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`
`29`		`-func prepareGoSource(b *testing.B) {`
	`29`	`+func prepareGoSource(b testing.TB) {`
`30`	`30`	`chdir(b, filepath.Join(build.Default.GOROOT, "src"))`
`31`	`31`	`}`
`32`	`32`
`33`		`-func prepareGithubProject(owner, name string) func(*testing.B) {`
`34`		`- return func(b *testing.B) {`
	`33`	`+func prepareGithubProject(owner, name string) func(testing.TB) {`
	`34`	`+ return func(b testing.TB) {`
`35`	`35`	`dir := filepath.Join(build.Default.GOPATH, "src", "github.com", owner, name)`
`36`	`36`	`_, err := os.Stat(dir)`
`37`	`37`	`if os.IsNotExist(err) {`
`@@ -79,7 +79,7 @@ func getGolangciLintCommonArgs() []string {`
`79`	`79`	`return []string{"run", "--no-config", "--issues-exit-code=0", "--deadline=30m", "--disable-all", "--enable=govet"}`
`80`	`80`	`}`
`81`	`81`
`82`		`-func runGolangciLintForBench(b *testing.B) {`
	`82`	`+func runGolangciLintForBench(b testing.TB) {`
`83`	`83`	`args := getGolangciLintCommonArgs()`
`84`	`84`	`args = append(args, getBenchLintersArgs()...)`
`85`	`85`	`printCommand("golangci-lint", args...)`
`@@ -180,7 +180,7 @@ type runResult struct {`
`180`	`180`	`duration time.Duration`
`181`	`181`	`}`
`182`	`182`
`183`		`-func runOne(b testing.B, run func(testing.B), progName string) *runResult {`
	`183`	`+func runOne(b testing.B, run func(testing.TB), progName string) runResult {`
`184`	`184`	`doneCh := make(chan struct{})`
`185`	`185`	`peakMemCh := trackPeakMemoryUsage(b, doneCh, progName)`
`186`	`186`	`startedAt := time.Now()`
`@@ -200,7 +200,7 @@ func BenchmarkGolangciLint(b *testing.B) {`
`200`	`200`
`201`	`201`	`type bcase struct {`
`202`	`202`	`name string`
`203`		`- prepare func(*testing.B)`
	`203`	`+ prepare func(testing.TB)`
`204`	`204`	`}`
`205`	`205`	`bcases := []bcase{`
`206`	`206`	`{`