From 0314faea3452ff97957b516c13f423230d8a2c93 Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Mon, 12 Aug 2024 17:49:13 +0200
Subject: [PATCH] Bump golangci-lint version

---
 .github/workflows/main.yml  |  2 +-
 .golangci.yml               |  9 +++++----
 encoding/ewkb/sql.go        | 14 +++++++-------
 encoding/geojson/geojson.go |  2 +-
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 691cb049..9dc213cd 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -5,7 +5,7 @@ on:
 env:
   GOFUMPT_VERSION: 0.6.0
   GOTOOLCHAIN: local
-  GOLANGCI_LINT_VERSION: 1.56.2
+  GOLANGCI_LINT_VERSION: 1.59.1
 jobs:
   linux:
     runs-on: ubuntu-latest
diff --git a/.golangci.yml b/.golangci.yml
index fa6a0504..1f76deca 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -4,6 +4,7 @@ linters:
   - asciicheck
   - bidichk
   - bodyclose
+  - canonicalheader
   - containedctx
   - contextcheck
   - decorder
@@ -11,11 +12,12 @@ linters:
   - dupl
   - dupword
   - durationcheck
+  - err113
   - errcheck
   - errchkjson
   - errorlint
-  - execinquery
   - exportloopref
+  - fatcontext
   - forbidigo
   - forcetypeassert
   - gci
@@ -25,7 +27,6 @@ linters:
   - gochecksumtype
   - gocritic
   - godot
-  - goerr113
   - gofmt
   - gofumpt
   - goimports
@@ -78,6 +79,7 @@ linters:
   - unparam
   - unused
   - usestdlibvars
+  - wastedassign
   - whitespace
   - zerologlint
   disable:
@@ -104,7 +106,6 @@ linters:
   - testpackage
   - testpackage
   - varnamelen
-  - wastedassign # https://github.com/golangci/golangci-lint/issues/2649
   - wrapcheck
   - wsl
 
@@ -149,7 +150,7 @@ issues:
     - godot
     path: "^xyz/"
   - linters:
-    - goerr113
+    - err113
     text: "do not define dynamic errors, use wrapped static errors instead"
   - linters:
     - forbidigo
diff --git a/encoding/ewkb/sql.go b/encoding/ewkb/sql.go
index 105ba97f..2efa8dea 100644
--- a/encoding/ewkb/sql.go
+++ b/encoding/ewkb/sql.go
@@ -90,7 +90,7 @@ func (p *Point) Valid() bool {
 // Value returns the EWKB encoding of p.
 func (p *Point) Value() (driver.Value, error) {
 	if p.Point == nil {
-		return nil, nil
+		return nil, nil //nolint:nilnil
 	}
 	return value(p.Point)
 }
@@ -125,7 +125,7 @@ func (ls *LineString) Valid() bool {
 // Value returns the EWKB encoding of ls.
 func (ls *LineString) Value() (driver.Value, error) {
 	if ls.LineString == nil {
-		return nil, nil
+		return nil, nil //nolint:nilnil
 	}
 	return value(ls.LineString)
 }
@@ -160,7 +160,7 @@ func (p *Polygon) Valid() bool {
 // Value returns the EWKB encoding of p.
 func (p *Polygon) Value() (driver.Value, error) {
 	if p.Polygon == nil {
-		return nil, nil
+		return nil, nil //nolint:nilnil
 	}
 	return value(p.Polygon)
 }
@@ -195,7 +195,7 @@ func (mp *MultiPoint) Valid() bool {
 // Value returns the EWKB encoding of mp.
 func (mp *MultiPoint) Value() (driver.Value, error) {
 	if mp.MultiPoint == nil {
-		return nil, nil
+		return nil, nil //nolint:nilnil
 	}
 	return value(mp.MultiPoint)
 }
@@ -230,7 +230,7 @@ func (mls *MultiLineString) Valid() bool {
 // Value returns the EWKB encoding of mls.
 func (mls *MultiLineString) Value() (driver.Value, error) {
 	if mls.MultiLineString == nil {
-		return nil, nil
+		return nil, nil //nolint:nilnil
 	}
 	return value(mls.MultiLineString)
 }
@@ -265,7 +265,7 @@ func (mp *MultiPolygon) Valid() bool {
 // Value returns the EWKB encoding of mp.
 func (mp *MultiPolygon) Value() (driver.Value, error) {
 	if mp.MultiPolygon == nil {
-		return nil, nil
+		return nil, nil //nolint:nilnil
 	}
 	return value(mp.MultiPolygon)
 }
@@ -300,7 +300,7 @@ func (gc *GeometryCollection) Valid() bool {
 // Value returns the EWKB encoding of gc.
 func (gc *GeometryCollection) Value() (driver.Value, error) {
 	if gc.GeometryCollection == nil {
-		return nil, nil
+		return nil, nil //nolint:nilnil
 	}
 	return value(gc.GeometryCollection)
 }
diff --git a/encoding/geojson/geojson.go b/encoding/geojson/geojson.go
index d328de76..f32659ab 100644
--- a/encoding/geojson/geojson.go
+++ b/encoding/geojson/geojson.go
@@ -114,7 +114,7 @@ func guessLayout3(coords3 [][][]geom.Coord) (geom.Layout, error) {
 // Decode decodes g to a geometry.
 func (g *Geometry) Decode() (geom.T, error) {
 	if g == nil {
-		return nil, nil
+		return nil, nil //nolint:nilnil
 	}
 	switch g.Type {
 	case "Point":