chore: refactor to uncalled

Refactor to use uncalled which is a generic version rowserr that uses
a configuration to enable rules based checks instead of hard-coded for
database/sql Rows.Err() checks only.

Author: stevenh

.golangci.reference.yml

@@ -1636,14 +1636,6 @@ linters-settings:
         severity: warning
         disabled: false
 
-  rowserr:
-    # packages sets additional packages to check.
-    # The following know sql packages are always checked:
-    # - database/sql
-    # - github.com/jmoiron/sqlx
-    # Default: []
-    packages: []
-
   rowserrcheck:
     # database/sql is always checked
     # Default: []
@@ -1754,6 +1746,28 @@ linters-settings:
       # Default: true
       begin: false
 
+  uncalled:
+    rules:
+      # Check for uncalled Rows.Err
+      - name: sql.Rows
+        disabled: false
+        severity: warning
+        packages:
+          - database/sql
+          - github.com/jmoiron/sqlx
+        call:
+          methods: []
+          results:
+            - type: .Rows
+              pointer: true
+            - type: error
+              pointer: false
+        expect:
+          method: .Err
+          resultIndex: 0
+          args: []
+
+
   usestdlibvars:
     # Suggest the use of http.MethodXX.
     # Default: true
@@ -2047,7 +2061,6 @@ linters:
     - promlinter
     - reassign
     - revive
-    - rowserr
     - rowserrcheck
     - scopelint
     - sqlclosecheck
@@ -2061,6 +2074,7 @@ linters:
     - thelper
     - tparallel
     - typecheck
+    - uncalled
     - unconvert
     - unparam
     - unused
@@ -2155,7 +2169,6 @@ linters:
     - promlinter
     - reassign
     - revive
-    - rowserr
     - rowserrcheck
     - scopelint
     - sqlclosecheck
@@ -2169,6 +2182,7 @@ linters:
     - thelper
     - tparallel
     - typecheck
+    - uncalled
     - unconvert
     - unparam
     - unused

go.mod

@@ -93,7 +93,7 @@ require (
 	github.com/spf13/viper v1.12.0
 	github.com/ssgreg/nlreturn/v2 v2.2.1
 	github.com/stbenjam/no-sprintf-host-port v0.1.1
-	github.com/stevenh/go-rowserr v0.2.0
+	github.com/stevenh/go-uncalled v0.3.0
 	github.com/stretchr/testify v1.8.1
 	github.com/tdakkota/asciicheck v0.1.1
 	github.com/tetafro/godot v1.4.11

go.sum

@@ -4,6 +4,7 @@ import (
 	"runtime"
 
 	"github.com/pkg/errors"
+	"github.com/stevenh/go-uncalled/pkg/uncalled"
 )
 
 var defaultLintersSettings = LintersSettings{
@@ -190,7 +191,6 @@ type LintersSettings struct {
 	Promlinter       PromlinterSettings
 	Reassign         ReassignSettings
 	Revive           ReviveSettings
-	RowsErr          RowsErrSettings
 	RowsErrCheck     RowsErrCheckSettings
 	Staticcheck      StaticCheckSettings
 	Structcheck      StructCheckSettings
@@ -199,6 +199,7 @@ type LintersSettings struct {
 	Tenv             TenvSettings
 	Testpackage      TestpackageSettings
 	Thelper          ThelperSettings
+	Uncalled         UncalledSettings
 	Unparam          UnparamSettings
 	Unused           StaticCheckSettings
 	UseStdlibVars    UseStdlibVarsSettings
@@ -601,9 +602,8 @@ type ReviveSettings struct {
 		Severity string
 	}
 }
-type RowsErrSettings struct {
-	Packages []string
-}
+
+type UncalledSettings = uncalled.Config
 
 type RowsErrCheckSettings struct {
 	Packages []string

pkg/config/linters_settings.go

@@ -1,15 +1,15 @@
 package golinters
 
 import (
-	"github.com/stevenh/go-rowserr/pkg/rowserr"
+	"github.com/stevenh/go-uncalled/pkg/uncalled"
 	"golang.org/x/tools/go/analysis"
 
 	"github.com/golangci/golangci-lint/pkg/config"
 	"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
 )
 
-func NewRowsErr(settings *config.RowsErrSettings) *goanalysis.Linter {
-	a := rowserr.NewAnalyzer(settings.Packages...)
+func NewUncalled(settings *config.UncalledSettings) *goanalysis.Linter {
+	a := uncalled.NewAnalyzer(settings)
 	return goanalysis.NewLinter(
 		a.Name,
 		a.Doc,

pkg/golinters/rowserr.go pkg/golinters/uncalled.gopkg/golinters/rowserr.go renamed to pkg/golinters/uncalled.go

@@ -158,7 +158,6 @@ func (m Manager) GetAllSupportedLinterConfigs() []*linter.Config {
 		promlinterCfg       *config.PromlinterSettings
 		reassignCfg         *config.ReassignSettings
 		reviveCfg           *config.ReviveSettings
-		rowserrCfg          *config.RowsErrSettings
 		rowserrcheckCfg     *config.RowsErrCheckSettings
 		staticcheckCfg      *config.StaticCheckSettings
 		structcheckCfg      *config.StructCheckSettings
@@ -167,6 +166,7 @@ func (m Manager) GetAllSupportedLinterConfigs() []*linter.Config {
 		tenvCfg             *config.TenvSettings
 		testpackageCfg      *config.TestpackageSettings
 		thelperCfg          *config.ThelperSettings
+		uncalledCfg         *config.UncalledSettings
 		unparamCfg          *config.UnparamSettings
 		unusedCfg           *config.StaticCheckSettings
 		usestdlibvars       *config.UseStdlibVarsSettings
@@ -235,7 +235,6 @@ func (m Manager) GetAllSupportedLinterConfigs() []*linter.Config {
 		promlinterCfg = &m.cfg.LintersSettings.Promlinter
 		reassignCfg = &m.cfg.LintersSettings.Reassign
 		reviveCfg = &m.cfg.LintersSettings.Revive
-		rowserrCfg = &m.cfg.LintersSettings.RowsErr
 		rowserrcheckCfg = &m.cfg.LintersSettings.RowsErrCheck
 		staticcheckCfg = &m.cfg.LintersSettings.Staticcheck
 		structcheckCfg = &m.cfg.LintersSettings.Structcheck
@@ -244,6 +243,7 @@ func (m Manager) GetAllSupportedLinterConfigs() []*linter.Config {
 		tenvCfg = &m.cfg.LintersSettings.Tenv
 		testpackageCfg = &m.cfg.LintersSettings.Testpackage
 		thelperCfg = &m.cfg.LintersSettings.Thelper
+		uncalledCfg = &m.cfg.LintersSettings.Uncalled
 		unparamCfg = &m.cfg.LintersSettings.Unparam
 		unusedCfg = &m.cfg.LintersSettings.Unused
 		varcheckCfg = &m.cfg.LintersSettings.Varcheck
@@ -709,12 +709,6 @@ func (m Manager) GetAllSupportedLinterConfigs() []*linter.Config {
 			ConsiderSlow().
 			WithURL("https://github.com/mgechev/revive"),
 
-		linter.NewConfig(golinters.NewRowsErr(rowserrCfg)).
-			WithSince("v1.51.0").
-			WithLoadForGoAnalysis().
-			WithPresets(linter.PresetBugs, linter.PresetSQL).
-			WithURL("https://github.com/stevenh/go-rowserr"),
-
 		linter.NewConfig(golinters.NewRowsErrCheck(rowserrcheckCfg)).
 			WithSince("v1.23.0").
 			WithLoadForGoAnalysis().
@@ -795,6 +789,12 @@ func (m Manager) GetAllSupportedLinterConfigs() []*linter.Config {
 			WithPresets(linter.PresetBugs).
 			WithURL(""),
 
+		linter.NewConfig(golinters.NewUncalled(uncalledCfg)).
+			WithSince("v1.51.0").
+			WithLoadForGoAnalysis().
+			WithPresets(linter.PresetBugs, linter.PresetSQL).
+			WithURL("https://github.com/stevenh/go-uncalled"),
+
 		linter.NewConfig(golinters.NewUnconvert()).
 			WithSince("v1.0.0").
 			WithLoadForGoAnalysis().