chore: update ci config and linter

.circleci/circle_build.sh

@@ -5,9 +5,4 @@ set -ex
 # might as well run a little longer
 export FUZZ_TIME=20s
 
-# there are too many golangci plugins that don't work for 1.19 just yet, so just skip linting for it
-if [[ "$GO_VER" == 1.18.* ]]; then
-  make
-else
-  make test_with_fuzz
-fi
+make

.circleci/config.yml

@@ -9,7 +9,7 @@ jobs:
       - image: cimg/go:<< parameters.golang-version >>
     steps:
       - checkout
-      - run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.45.2
+      - run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.60.1
       - run: .circleci/circle_build.sh
 
 workflows:
@@ -19,5 +19,4 @@ workflows:
           matrix:
             parameters:
               golang-version:
-                - '1.18'
-                - '1.19'
+                - "1.23"

.golangci.yml

@@ -1,7 +1,7 @@
 run:
   tests: false
 
-linters: 
+linters:
   disable-all: true
   enable:
     - asciicheck
@@ -10,19 +10,20 @@ linters:
     - containedctx
     - contextcheck
     - decorder
-    - depguard
+    # Disabling depguard as there is no guarded list of imports
+    # - depguard
     - dogsled
     - dupl
     - durationcheck
     - errcheck
     - errchkjson
-    # FIXME: commented out as it crashes with 1.18 for now
-    # - errname
+    - errname
     - errorlint
     - exportloopref
     - forbidigo
     - funlen
-    - gci
+    # Don't need gci and goimports
+    # - gci
     - gochecknoglobals
     - gochecknoinits
     - gocognit
@@ -34,15 +35,14 @@ linters:
     - gofumpt
     - goheader
     - goimports
-    - gomnd
+    - mnd
     - gomoddirectives
     - gomodguard
     - goprintffuncname
     - gosec
     - gosimple
     - govet
     - grouper
-    - ifshort
     - importas
     - ineffassign
     - lll
@@ -58,23 +58,21 @@ linters:
     - prealloc
     - predeclared
     - promlinter
-    # FIXME: doesn't support 1.18 yet
-    # - revive
+    - revive
     - rowserrcheck
     - sqlclosecheck
     - staticcheck
-    - structcheck
     - stylecheck
     - tagliatelle
     - tenv
     - testpackage
     - thelper
     - tparallel
-    - typecheck
+    # FIXME: doesn't support 1.23 yet
+    # - typecheck
     - unconvert
     - unparam
     - unused
-    - varcheck
     - varnamelen
     - wastedassign
     - whitespace

json.go

@@ -78,7 +78,7 @@ func (om *OrderedMap[K, V]) MarshalJSON() ([]byte, error) { //nolint:funlen
 
 		writer.RawByte(':')
 		// the error is checked at the end of the function
-		writer.Raw(json.Marshal(pair.Value)) //nolint:errchkjson
+		writer.Raw(json.Marshal(pair.Value))
 	}
 
 	writer.RawByte('}')

orderedmap.go

@@ -52,7 +52,7 @@ func WithInitialData[K comparable, V any](initialData ...Pair[K, V]) InitOption[
 // New creates a new OrderedMap.
 // options can either be one or several InitOption[K, V], or a single integer,
 // which is then interpreted as a capacity hint, à la make(map[K]V, capacity).
-func New[K comparable, V any](options ...any) *OrderedMap[K, V] { //nolint:varnamelen
+func New[K comparable, V any](options ...any) *OrderedMap[K, V] {
 	orderedMap := &OrderedMap[K, V]{}
 
 	var config initConfig[K, V]
@@ -363,11 +363,11 @@ func (om *OrderedMap[K, V]) ValuesFromNewest() iter.Seq[V] {
 
 // From creates a new OrderedMap from an iterator over key-value pairs.
 func From[K comparable, V any](i iter.Seq2[K, V]) *OrderedMap[K, V] {
-	om := New[K, V]()
+	oMap := New[K, V]()
 
 	for k, v := range i {
-		om.Set(k, v)
+		oMap.Set(k, v)
 	}
 
-	return om
+	return oMap
 }