Skip to content

Commit 8e46749

Browse files
twpaynetwpayne
authored
Merge pull request #253 from twpayne/misc-fixes
Miscellaneous fixes
2 parents 91fb2e1 + 0314fae commit 8e46749

File tree

6 files changed

+34
-42
lines changed

6 files changed

+34
-42
lines changed

‎.github/workflows/main.yml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@ on:
44
push:
55
env:
66
GOFUMPT_VERSION: 0.6.0
7-
GOLANGCI_LINT_VERSION: 1.56.2
7+
GOTOOLCHAIN: local
8+
GOLANGCI_LINT_VERSION: 1.59.1
89
jobs:
910
linux:
1011
runs-on: ubuntu-latest
1112
steps:
12-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
13-
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491
13+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
14+
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32
1415
with:
1516
cache: true
1617
go-version-file: go.mod
@@ -29,8 +30,8 @@ jobs:
2930
darwin:
3031
runs-on: macos-latest
3132
steps:
32-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
33-
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491
33+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
34+
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32
3435
with:
3536
cache: true
3637
go-version-file: go.mod
@@ -41,8 +42,8 @@ jobs:
4142
windows:
4243
runs-on: windows-latest
4344
steps:
44-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
45-
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491
45+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
46+
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32
4647
with:
4748
cache: true
4849
go-version-file: go.mod
@@ -53,12 +54,12 @@ jobs:
5354
lint:
5455
runs-on: ubuntu-latest
5556
steps:
56-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
57-
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491
57+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
58+
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32
5859
with:
5960
cache: true
6061
go-version-file: go.mod
61-
- uses: golangci/golangci-lint-action@3cfe3a4abbb849e10058ce4af15d205b6da42804
62+
- uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86
6263
with:
6364
version: v${{ env.GOLANGCI_LINT_VERSION }}
6465
- name: format

‎.golangci.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,20 @@ linters:
44
- asciicheck
55
- bidichk
66
- bodyclose
7+
- canonicalheader
78
- containedctx
89
- contextcheck
910
- decorder
1011
- dogsled
1112
- dupl
1213
- dupword
1314
- durationcheck
15+
- err113
1416
- errcheck
1517
- errchkjson
1618
- errorlint
17-
- execinquery
1819
- exportloopref
20+
- fatcontext
1921
- forbidigo
2022
- forcetypeassert
2123
- gci
@@ -25,7 +27,6 @@ linters:
2527
- gochecksumtype
2628
- gocritic
2729
- godot
28-
- goerr113
2930
- gofmt
3031
- gofumpt
3132
- goimports
@@ -78,6 +79,7 @@ linters:
7879
- unparam
7980
- unused
8081
- usestdlibvars
82+
- wastedassign
8183
- whitespace
8284
- zerologlint
8385
disable:
@@ -104,7 +106,6 @@ linters:
104106
- testpackage
105107
- testpackage
106108
- varnamelen
107-
- wastedassign # https://github.com/golangci/golangci-lint/issues/2649
108109
- wrapcheck
109110
- wsl
110111

@@ -149,7 +150,7 @@ issues:
149150
- godot
150151
path: "^xyz/"
151152
- linters:
152-
- goerr113
153+
- err113
153154
text: "do not define dynamic errors, use wrapped static errors instead"
154155
- linters:
155156
- forbidigo

‎encoding/ewkb/sql.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func (p *Point) Valid() bool {
9090
// Value returns the EWKB encoding of p.
9191
func (p *Point) Value() (driver.Value, error) {
9292
if p.Point == nil {
93-
return nil, nil
93+
return nil, nil //nolint:nilnil
9494
}
9595
return value(p.Point)
9696
}
@@ -125,7 +125,7 @@ func (ls *LineString) Valid() bool {
125125
// Value returns the EWKB encoding of ls.
126126
func (ls *LineString) Value() (driver.Value, error) {
127127
if ls.LineString == nil {
128-
return nil, nil
128+
return nil, nil //nolint:nilnil
129129
}
130130
return value(ls.LineString)
131131
}
@@ -160,7 +160,7 @@ func (p *Polygon) Valid() bool {
160160
// Value returns the EWKB encoding of p.
161161
func (p *Polygon) Value() (driver.Value, error) {
162162
if p.Polygon == nil {
163-
return nil, nil
163+
return nil, nil //nolint:nilnil
164164
}
165165
return value(p.Polygon)
166166
}
@@ -195,7 +195,7 @@ func (mp *MultiPoint) Valid() bool {
195195
// Value returns the EWKB encoding of mp.
196196
func (mp *MultiPoint) Value() (driver.Value, error) {
197197
if mp.MultiPoint == nil {
198-
return nil, nil
198+
return nil, nil //nolint:nilnil
199199
}
200200
return value(mp.MultiPoint)
201201
}
@@ -230,7 +230,7 @@ func (mls *MultiLineString) Valid() bool {
230230
// Value returns the EWKB encoding of mls.
231231
func (mls *MultiLineString) Value() (driver.Value, error) {
232232
if mls.MultiLineString == nil {
233-
return nil, nil
233+
return nil, nil //nolint:nilnil
234234
}
235235
return value(mls.MultiLineString)
236236
}
@@ -265,7 +265,7 @@ func (mp *MultiPolygon) Valid() bool {
265265
// Value returns the EWKB encoding of mp.
266266
func (mp *MultiPolygon) Value() (driver.Value, error) {
267267
if mp.MultiPolygon == nil {
268-
return nil, nil
268+
return nil, nil //nolint:nilnil
269269
}
270270
return value(mp.MultiPolygon)
271271
}
@@ -300,7 +300,7 @@ func (gc *GeometryCollection) Valid() bool {
300300
// Value returns the EWKB encoding of gc.
301301
func (gc *GeometryCollection) Value() (driver.Value, error) {
302302
if gc.GeometryCollection == nil {
303-
return nil, nil
303+
return nil, nil //nolint:nilnil
304304
}
305305
return value(gc.GeometryCollection)
306306
}

‎encoding/geojson/geojson.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ func guessLayout3(coords3 [][][]geom.Coord) (geom.Layout, error) {
114114
// Decode decodes g to a geometry.
115115
func (g *Geometry) Decode() (geom.T, error) {
116116
if g == nil {
117-
return nil, nil
117+
return nil, nil //nolint:nilnil
118118
}
119119
switch g.Type {
120120
case "Point":

‎go.mod

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,13 @@ module github.com/twpayne/go-geom
22

33
go 1.21
44

5-
toolchain go1.22.1
6-
75
require (
86
github.com/DATA-DOG/go-sqlmock v1.5.2
9-
github.com/alecthomas/assert/v2 v2.6.0
7+
github.com/alecthomas/assert/v2 v2.10.0
108
github.com/lib/pq v1.10.9
119
github.com/testcontainers/testcontainers-go v0.29.1
1210
github.com/testcontainers/testcontainers-go/modules/postgres v0.29.1
13-
github.com/twpayne/go-kml/v3 v3.1.0
11+
github.com/twpayne/go-kml/v3 v3.1.1
1412
)
1513

1614
require (

‎go.sum

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,8 @@ github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migc
1010
github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
1111
github.com/Microsoft/hcsshim v0.12.0 h1:rbICA+XZFwrBef2Odk++0LjFvClNCJGRK+fsrP254Ts=
1212
github.com/Microsoft/hcsshim v0.12.0/go.mod h1:RZV12pcHCXQ42XnlQ3pz6FZfmrC1C+R4gaOHhRNML1g=
13-
github.com/alecthomas/assert v1.0.0 h1:3XmGh/PSuLzDbK3W2gUbRXwgW5lqPkuqvRgeQ30FI5o=
14-
github.com/alecthomas/assert v1.0.0/go.mod h1:va/d2JC+M7F6s+80kl/R3G7FUiW6JzUO+hPhLyJ36ZY=
15-
github.com/alecthomas/assert/v2 v2.6.0 h1:o3WJwILtexrEUk3cUVal3oiQY2tfgr/FHWiz/v2n4FU=
16-
github.com/alecthomas/assert/v2 v2.6.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k=
17-
github.com/alecthomas/colour v0.1.0 h1:nOE9rJm6dsZ66RGWYSFrXw461ZIt9A6+nHgL7FRrDUk=
18-
github.com/alecthomas/colour v0.1.0/go.mod h1:QO9JBoKquHd+jz9nshCh40fOfO+JzsoXy8qTHF68zU0=
13+
github.com/alecthomas/assert/v2 v2.10.0 h1:jjRCHsj6hBJhkmhznrCzoNpbA3zqy0fYiUcYZP/GkPY=
14+
github.com/alecthomas/assert/v2 v2.10.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k=
1915
github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc=
2016
github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
2117
github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
@@ -81,8 +77,6 @@ github.com/lufia/plan9stats v0.0.0-20240226150601-1dcf7310316a h1:3Bm7EwfUQUvhNe
8177
github.com/lufia/plan9stats v0.0.0-20240226150601-1dcf7310316a/go.mod h1:ilwx/Dta8jXAgpFYFvSWEMwxmbWXyiUHkd5FwyKhb5k=
8278
github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
8379
github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
84-
github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
85-
github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
8680
github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
8781
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
8882
github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk=
@@ -106,8 +100,6 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
106100
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
107101
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt9k/+g42oCprj/FisM4qX9L3sZB3upGN2ZU=
108102
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
109-
github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=
110-
github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
111103
github.com/shirou/gopsutil/v3 v3.24.2 h1:kcR0erMbLg5/3LcInpw0X/rrPSqq4CDPyI6A6ZRC18Y=
112104
github.com/shirou/gopsutil/v3 v3.24.2/go.mod h1:tSg/594BcA+8UdQU2XcW803GWYgdtauFFPgJCJKZlVk=
113105
github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
@@ -135,8 +127,8 @@ github.com/tklauser/go-sysconf v0.3.13/go.mod h1:zwleP4Q4OehZHGn4CYZDipCgg9usW5I
135127
github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY=
136128
github.com/tklauser/numcpus v0.7.0 h1:yjuerZP127QG9m5Zh/mSO4wqurYil27tHrqwRoRjpr4=
137129
github.com/tklauser/numcpus v0.7.0/go.mod h1:bb6dMVcj8A42tSE7i32fsIUCbQNllK5iDguyOZRUzAY=
138-
github.com/twpayne/go-kml/v3 v3.1.0 h1:sCTIhB5VtyhOyiiGAaGZG7t/C7yFleNn8jmgWfhwtGQ=
139-
github.com/twpayne/go-kml/v3 v3.1.0/go.mod h1:MtFRxfOSa60jCuC/mZNa2c9WkvOxk3t/h7o5lrsi1h4=
130+
github.com/twpayne/go-kml/v3 v3.1.1 h1:Fq2k4nKa2dIipJt0r5gwLEYcJA/7WeqKW2KTkrRXWOs=
131+
github.com/twpayne/go-kml/v3 v3.1.1/go.mod h1:7VT0jsr6fzn5CPZ5e4OB93vhgf3fZcwflK7ydbXFVos=
140132
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
141133
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
142134
github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
@@ -172,8 +164,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
172164
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
173165
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
174166
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
175-
golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc=
176-
golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
167+
golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
168+
golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
177169
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
178170
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
179171
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -194,8 +186,8 @@ golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
194186
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
195187
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
196188
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
197-
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
198-
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
189+
golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
190+
golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
199191
golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
200192
golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
201193
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

0 commit comments

Comments
 (0)