Merge pull request #617 from peterstace/upgrade_to_golangci-lint_1.58.2

Upgrade to golangci-lint v0.58.2
peterstace · May 21, 2024 · 3d40b0d · 3d40b0d
2 parents 86598d2 + 0df28b9
commit 3d40b0d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.ci/golint.Dockerfile b/.ci/golint.Dockerfile
@@ -1,4 +1,4 @@
-FROM golangci/golangci-lint:v1.58.1
+FROM golangci/golangci-lint:v1.58.2
 
 RUN apt-get update \
   && apt-get install -y -q --no-install-recommends \

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## Unreleased
 
-- Upgrades `golangci-lint` to `v1.58.1`.
+- Upgrades `golangci-lint` to `v1.58.2`.
 
 - Fixes a bug where geometry collections with mixed coordinate types were
   erroneously allowed during WKT and WKB parsing.

diff --git a/geom/geojson_feature_collection.go b/geom/geojson_feature_collection.go
@@ -153,7 +153,7 @@ func (c *GeoJSONFeatureCollection) UnmarshalJSON(p []byte) error {
 		Type     string           `json:"type"`
 		Features []GeoJSONFeature `json:"features"`
 	}
-	if err := json.Unmarshal(p, &topLevel); err != nil { //nolint:musttag
+	if err := json.Unmarshal(p, &topLevel); err != nil {
 		return err
 	}
 	if topLevel.Type == "" {

diff --git a/geom/type_null_geometry.go b/geom/type_null_geometry.go
@@ -24,7 +24,7 @@ func (ng *NullGeometry) Scan(value interface{}) error {
 // Value implements the database/sql/driver.Valuer interface.
 func (ng NullGeometry) Value() (driver.Value, error) {
 	if !ng.Valid {
-		return nil, nil
+		return nil, nil //nolint:nilnil
 	}
 	return ng.Geometry.Value()
 }