Merge pull request #204 from twpayne/update-lint

Update golangci-lint to 1.40.1
twpayne · Jun 2, 2021 · 25827fa · 25827fa
2 parents 68be081 + 7a8b0f4
commit 25827fa
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -20,7 +20,6 @@ linters:
   - gofmt
   - gofumpt
   - goimports
-  - golint
   - gomoddirectives
   - gomodguard
   - goprintffuncname
@@ -38,12 +37,14 @@ linters:
   - nolintlint
   - prealloc
   - predeclared
+  - promlinter
   - revive
   - rowserrcheck
   - sqlclosecheck
   - staticcheck
   - structcheck
   - stylecheck
+  - tagliatelle
   - thelper
   - tparallel
   - typecheck
@@ -62,6 +63,7 @@ linters:
   - gocognit
   - goconst
   - gocyclo
+  - godox
   - goheader
   - godox
   - gomnd

diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-GOLANGCI_LINT_VERSION=1.39.0
+GOLANGCI_LINT_VERSION=1.40.1
 
 .PHONY: all
 all: test lint

diff --git a/encoding/wkt/wkt.go b/encoding/wkt/wkt.go
@@ -45,10 +45,10 @@ func NewEncoder(applyOptFns ...EncodeOption) *Encoder {
 	return encoder
 }
 
-// EncodeOptions specify options to apply to the encoder.
+// An EncodeOption is an encoder option.
 type EncodeOption func(*Encoder)
 
-// EncodeWithMaxDecimalDigits sets the maximum decimal digits to encode.
+// EncodeOptionWithMaxDecimalDigits sets the maximum decimal digits to encode.
 func EncodeOptionWithMaxDecimalDigits(maxDecimalDigits int) EncodeOption {
 	return func(e *Encoder) {
 		e.maxDecimalDigits = maxDecimalDigits