Skip to content

Commit e9f1a3e

Browse files
committed
build(deps): bump github.com/quasilyte/go-ruleguard from v0.3.19 to v0.3.20
1 parent 03b1824 commit e9f1a3e

File tree

5 files changed

+6
-39
lines changed

5 files changed

+6
-39
lines changed

go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ require (
166166
github.com/prometheus/client_model v0.2.0 // indirect
167167
github.com/prometheus/common v0.32.1 // indirect
168168
github.com/prometheus/procfs v0.7.3 // indirect
169-
github.com/quasilyte/go-ruleguard v0.3.19 // indirect
169+
github.com/quasilyte/go-ruleguard v0.3.20 // indirect
170170
github.com/quasilyte/gogrep v0.5.0 // indirect
171171
github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
172172
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
@@ -184,7 +184,7 @@ require (
184184
go.uber.org/atomic v1.7.0 // indirect
185185
go.uber.org/multierr v1.6.0 // indirect
186186
go.uber.org/zap v1.24.0 // indirect
187-
golang.org/x/exp/typeparams v0.0.0-20230224173230-c95f2b4c22f2 // indirect
187+
golang.org/x/exp/typeparams v0.0.0-20230307190834-24139beb5833 // indirect
188188
golang.org/x/mod v0.12.0 // indirect
189189
golang.org/x/sync v0.3.0 // indirect
190190
golang.org/x/sys v0.11.0 // indirect

go.sum

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/golinters/gocritic.go

-14
Original file line numberDiff line numberDiff line change
@@ -283,20 +283,6 @@ func newGoCriticSettingsWrapper(settings *config.GoCriticSettings, logger loguti
283283
allCheckerMap[checkInfo.Name] = checkInfo
284284
}
285285

286-
if settings != nil && config.IsGreaterThanOrEqualGo121(settings.Go) {
287-
var enabledChecks []string
288-
for _, check := range settings.EnabledChecks {
289-
if check == "ruleguard" {
290-
logger.Warnf("%s: check %q is disabled for go1.21 https://github.com/golangci/golangci-lint/issues/3933", goCriticName, "ruleguard")
291-
continue
292-
}
293-
294-
enabledChecks = append(enabledChecks, check)
295-
}
296-
297-
settings.EnabledChecks = enabledChecks
298-
}
299-
300286
return &goCriticSettingsWrapper{
301287
GoCriticSettings: settings,
302288
logger: logger,

test/fix_test.go

-12
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,6 @@ func TestFix(t *testing.T) {
4444
for _, input := range sources {
4545
input := input
4646

47-
// TODO(ldez): remove this limitation when gocritic/ruleguard will be fixed.
48-
if filepath.Base(input) == "gocritic.go" {
49-
t.Logf("skip gocritic because of a bug with ruleguard")
50-
continue
51-
}
52-
5347
t.Run(filepath.Base(input), func(t *testing.T) {
5448
t.Parallel()
5549

@@ -88,12 +82,6 @@ func TestFix_pathPrefix(t *testing.T) {
8882
for _, input := range sources {
8983
input := input
9084

91-
// TODO(ldez): remove this limitation when gocritic/ruleguard will be fixed.
92-
if filepath.Base(input) == "gocritic.go" {
93-
t.Logf("skip gocritic because of a bug with ruleguard")
94-
continue
95-
}
96-
9785
t.Run(filepath.Base(input), func(t *testing.T) {
9886
t.Parallel()
9987

test/linters_test.go

-7
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,6 @@ func testSourcesFromDir(t *testing.T, dir string) {
6262

6363
for _, source := range sources {
6464
source := source
65-
66-
// TODO(ldez): remove this limitation when gocritic/ruleguard will be fixed.
67-
if filepath.Base(source) == "gocritic.go" {
68-
t.Logf("skip gocritic because of a bug with ruleguard")
69-
continue
70-
}
71-
7265
t.Run(filepath.Base(source), func(subTest *testing.T) {
7366
subTest.Parallel()
7467

0 commit comments

Comments
 (0)