feat: deprecation step 2 of exportloopref

golangci · Jan 22, 2025 · 2b4386a · 2b4386a
1 parent 49aaa37
commit 2b4386a
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 153 deletions.
diff --git a/.golangci.next.reference.yml b/.golangci.next.reference.yml
@@ -31,10 +31,8 @@ linters:
     - errchkjson
     - errname
     - errorlint
-    - execinquery
     - exhaustive
     - exhaustruct
-    - exportloopref
     - exptostd
     - fatcontext
     - forbidigo
@@ -150,10 +148,8 @@ linters:
     - errchkjson
     - errname
     - errorlint
-    - execinquery
     - exhaustive
     - exhaustruct
-    - exportloopref
     - exptostd
     - fatcontext
     - forbidigo
@@ -243,12 +239,14 @@ linters:
     - wsl
     - zerologlint
     - deadcode # Deprecated
+    - execinquery # Deprecated
     - exhaustivestruct # Deprecated
+    - exportloopref # Deprecated
     - golint # Deprecated
+    - gomnd # Deprecated
     - ifshort # Deprecated
     - interfacer # Deprecated
     - maligned # Deprecated
-    - gomnd # Deprecated
     - nosnakecase # Deprecated
     - scopelint # Deprecated
     - structcheck # Deprecated

diff --git a/go.mod b/go.mod
@@ -63,7 +63,6 @@ require (
 	github.com/kkHAIKE/contextcheck v1.1.5
 	github.com/kulti/thelper v0.6.3
 	github.com/kunwardeep/paralleltest v1.0.10
-	github.com/kyoh86/exportloopref v0.1.11
 	github.com/lasiar/canonicalheader v1.1.2
 	github.com/ldez/exptostd v0.4.0
 	github.com/ldez/gomoddirectives v0.6.1

diff --git a/go.sum b/go.sum
diff --git a/jsonschema/golangci.next.jsonschema.json b/jsonschema/golangci.next.jsonschema.json
@@ -349,7 +349,6 @@
             "errorlint",
             "exhaustive",
             "exhaustruct",
-            "exportloopref",
             "exptostd",
             "fatcontext",
             "forbidigo",

diff --git a/pkg/golinters/exportloopref/exportloopref.go b/pkg/golinters/exportloopref/exportloopref.go
diff --git a/pkg/golinters/exportloopref/exportloopref_integration_test.go b/pkg/golinters/exportloopref/exportloopref_integration_test.go
diff --git a/pkg/golinters/exportloopref/testdata/exportloopref.go b/pkg/golinters/exportloopref/testdata/exportloopref.go
diff --git a/pkg/golinters/exportloopref/testdata/exportloopref_cgo.go b/pkg/golinters/exportloopref/testdata/exportloopref_cgo.go
diff --git a/pkg/lint/lintersdb/builder_linter.go b/pkg/lint/lintersdb/builder_linter.go
@@ -25,7 +25,6 @@ import (
 	"github.com/golangci/golangci-lint/pkg/golinters/errorlint"
 	"github.com/golangci/golangci-lint/pkg/golinters/exhaustive"
 	"github.com/golangci/golangci-lint/pkg/golinters/exhaustruct"
-	"github.com/golangci/golangci-lint/pkg/golinters/exportloopref"
 	"github.com/golangci/golangci-lint/pkg/golinters/exptostd"
 	"github.com/golangci/golangci-lint/pkg/golinters/fatcontext"
 	"github.com/golangci/golangci-lint/pkg/golinters/forbidigo"
@@ -278,12 +277,12 @@ func (LinterBuilder) Build(cfg *config.Config) ([]*linter.Config, error) {
 			WithLoadForGoAnalysis().
 			WithURL("https://github.com/GaijinEntertainment/go-exhaustruct"),
 
-		linter.NewConfig(exportloopref.New()).
+		linter.NewConfig(linter.NewNoopDeprecated("exportloopref", cfg, linter.DeprecationError)).
 			WithSince("v1.28.0").
 			WithPresets(linter.PresetBugs).
 			WithLoadForGoAnalysis().
 			WithURL("https://github.com/kyoh86/exportloopref").
-			DeprecatedWarning("Since Go1.22 (loopvar) this linter is no longer relevant.", "v1.60.2", "copyloopvar"),
+			DeprecatedError("Since Go1.22 (loopvar) this linter is no longer relevant.", "v1.60.2", "copyloopvar"),
 
 		linter.NewConfig(exptostd.New()).
 			WithSince("v1.63.0").