Merge branch 'origin/master' into to-string

Author: bluekeyes

.github/workflows/go.yml

@@ -9,18 +9,18 @@ jobs:
     name: Verify
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.19
-        uses: actions/setup-go@v3
+      - name: Set up Go 1.21
+        uses: actions/setup-go@v5
         with:
-          go-version: 1.19
+          go-version: 1.21
 
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.49
+          version: v1.59
 
       - name: Test
         run: go test -v ./...

.golangci.yml

@@ -4,27 +4,47 @@ run:
 linters:
   disable-all: true
   enable:
-    - deadcode
     - errcheck
     - gofmt
     - goimports
-    - golint
     - govet
     - ineffassign
     - misspell
+    - revive
     - typecheck
     - unconvert
-    - varcheck
+    - unused
 
 issues:
   exclude-use-default: false
 
 linters-settings:
-  goimports:
-    local-prefixes: github.com/bluekeyes/go-gitdiff
   errcheck:
     exclude-functions:
       - (*github.com/bluekeyes/go-gitdiff/gitdiff.formatter).Write
       - (*github.com/bluekeyes/go-gitdiff/gitdiff.formatter).WriteString
       - (*github.com/bluekeyes/go-gitdiff/gitdiff.formatter).WriteByte
       - fmt.Fprintf(*github.com/bluekeyes/go-gitdiff/gitdiff.formatter)
+  goimports:
+    local-prefixes: github.com/bluekeyes/go-gitdiff
+  revive:
+    rules:
+      # enable all rules from golint
+      - name: context-keys-type
+      - name: time-naming
+      - name: var-declaration
+      - name: unexported-return
+      - name: errorf
+      - name: blank-imports
+      - name: context-as-argument
+      - name: dot-imports
+      - name: error-return
+      - name: error-strings
+      - name: error-naming
+      - name: exported
+      - name: increment-decrement
+      - name: var-naming
+      - name: package-comments
+      - name: range
+      - name: receiver-naming
+      - name: indent-error-flow

go.mod

@@ -1,3 +1,3 @@
 module github.com/bluekeyes/go-gitdiff
 
-go 1.20
+go 1.21