Update golangci-lint configuration

twpayne · Mar 12, 2024 · 04303f0 · 04303f0
1 parent fac3329
commit 04303f0
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -4,7 +4,7 @@ on:
   push:
 env:
   GOFUMPT_VERSION: 0.3.1
-  GOLANGCI_LINT_VERSION: 1.49.0
+  GOLANGCI_LINT_VERSION: 1.56.2
 jobs:
   linux:
     runs-on: ubuntu-latest

diff --git a/.golangci.yml b/.golangci.yml
@@ -2,7 +2,6 @@ linters:
   enable:
   - asciicheck
   - bodyclose
-  - depguard
   - dogsled
   - dupl
   - durationcheck
@@ -37,6 +36,8 @@ linters:
   - predeclared
   - promlinter
   - revive
+  - rowserrcheck
+  - sqlclosecheck
   - staticcheck
   - stylecheck
   - tagliatelle
@@ -46,9 +47,11 @@ linters:
   - unconvert
   - unparam
   - unused
+  - wastedassign
   - whitespace
   disable:
   - cyclop
+  - depguard
   - exhaustive
   - exhaustivestruct
   - funlen
@@ -63,10 +66,7 @@ linters:
   - nestif
   - nlreturn
   - paralleltest
-  - rowserrcheck # https://github.com/golangci/golangci-lint/issues/2649
-  - sqlclosecheck # https://github.com/golangci/golangci-lint/issues/2649
   - testpackage
-  - wastedassign # https://github.com/golangci/golangci-lint/issues/2649
   - wrapcheck
   - wsl
 

diff --git a/encoding/geojson/geojson.go b/encoding/geojson/geojson.go
@@ -313,7 +313,7 @@ func EncodeGeometryWithBBox() EncodeGeometryOption {
 // EncodeGeometryWithCRS adds the crs field to the Geometry GeoJSON encoding.
 func EncodeGeometryWithCRS(crs *CRS) EncodeGeometryOption {
 	return EncodeGeometryOption{
-		onGeometryHandler: func(g *Geometry, t geom.T, opts ...EncodeGeometryOption) error {
+		onGeometryHandler: func(g *Geometry, _ geom.T, _ ...EncodeGeometryOption) error {
 			var err error
 			g.CRS = crs
 			return err

diff --git a/encoding/wkb/sql_example_test.go b/encoding/wkb/sql_example_test.go
@@ -160,6 +160,7 @@ func Example_value_different_shapes() {
 	}
 
 	for _, s := range shapes {
+		s := s
 		result, err := db.Exec(`INSERT INTO objects (name, location) VALUES (?, ?);`, s.Name, &s.Geom)
 		if err != nil {
 			log.Fatal(err)

diff --git a/xy/internal/robustdeterminate/robust_determinate.go b/xy/internal/robustdeterminate/robust_determinate.go
@@ -81,8 +81,7 @@ func SignOfDet2x2(x1, y1, x2, y2 float64) Sign {
 	 */
 	if 0.0 < y1 {
 		if 0.0 < y2 {
-			if y1 <= y2 {
-			} else {
+			if y1 > y2 {
 				sign = Negative
 				swap = x1
 				x1 = x2
@@ -145,8 +144,7 @@ func SignOfDet2x2(x1, y1, x2, y2 float64) Sign {
 	 */
 	if 0.0 < x1 {
 		if 0.0 < x2 {
-			if x1 <= x2 {
-			} else {
+			if x1 > x2 {
 				return sign
 			}
 		} else {