Update golangci-lint

Author: nekohasekai

.github/workflows/lint.yml

@@ -26,14 +26,17 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: ^1.23
+          go-version: ^1.25
       - name: Cache go module
         uses: actions/cache@v4
         with:
           path: |
             ~/go/pkg/mod
           key: go-${{ hashFiles('**/go.sum') }}
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v8
         with:
-          version: latest
+          version: latest
+          args: --timeout=30m
+          install-mode: binary
+          verify: false

.golangci.yml

@@ -1,24 +1,50 @@
+version: "2"
+run:
+  go: "1.24"
 linters:
-  disable-all: true
+  default: none
   enable:
-    - gofumpt
     - govet
-    - gci
-    - staticcheck
-    - paralleltest
     - ineffassign
-
-linters-settings:
-  gci:
-    custom-order: true
-    sections:
-      - standard
-      - prefix(github.com/sagernet/)
-      - default
-  staticcheck:
-    checks:
-      - all
-      - -SA1003
-
-run:
-  go: "1.23"
+    - paralleltest
+    - staticcheck
+  settings:
+    staticcheck:
+      checks:
+        - all
+        - -S1000
+        - -S1008
+        - -S1017
+        - -ST1001
+        - -ST1003
+        - -QF1001
+        - -QF1003
+        - -QF1008
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gci
+    - gofumpt
+  settings:
+    gci:
+      sections:
+        - standard
+        - prefix(github.com/sagernet/)
+        - default
+      custom-order: true
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

Makefile

@@ -15,7 +15,7 @@ lint:
 	GOOS=freebsd golangci-lint run
 
 lint_install:
-	go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
+	go install -v github.com/golangci/golangci-lint/v2/cmd/golangci-lint@latest
 
 test:
 	go test ./...

common/bufio/conn.go

@@ -190,40 +190,40 @@ type ExtendedConnWrapper struct {
 	writer N.ExtendedWriter
 }
 
-func (w *ExtendedConnWrapper) ReadBuffer(buffer *buf.Buffer) error {
-	return w.reader.ReadBuffer(buffer)
+func (c *ExtendedConnWrapper) ReadBuffer(buffer *buf.Buffer) error {
+	return c.reader.ReadBuffer(buffer)
 }
 
-func (w *ExtendedConnWrapper) WriteBuffer(buffer *buf.Buffer) error {
-	return w.writer.WriteBuffer(buffer)
+func (c *ExtendedConnWrapper) WriteBuffer(buffer *buf.Buffer) error {
+	return c.writer.WriteBuffer(buffer)
 }
 
-func (w *ExtendedConnWrapper) ReadFrom(r io.Reader) (n int64, err error) {
-	return Copy(w.writer, r)
+func (c *ExtendedConnWrapper) ReadFrom(r io.Reader) (n int64, err error) {
+	return Copy(c.writer, r)
 }
 
-func (r *ExtendedConnWrapper) WriteTo(w io.Writer) (n int64, err error) {
-	return Copy(w, r.reader)
+func (c *ExtendedConnWrapper) WriteTo(w io.Writer) (n int64, err error) {
+	return Copy(w, c.reader)
 }
 
-func (w *ExtendedConnWrapper) UpstreamReader() any {
-	return w.reader
+func (c *ExtendedConnWrapper) UpstreamReader() any {
+	return c.reader
 }
 
-func (w *ExtendedConnWrapper) ReaderReplaceable() bool {
+func (c *ExtendedConnWrapper) ReaderReplaceable() bool {
 	return true
 }
 
-func (w *ExtendedConnWrapper) UpstreamWriter() any {
-	return w.writer
+func (c *ExtendedConnWrapper) UpstreamWriter() any {
+	return c.writer
 }
 
-func (w *ExtendedConnWrapper) WriterReplaceable() bool {
+func (c *ExtendedConnWrapper) WriterReplaceable() bool {
 	return true
 }
 
-func (w *ExtendedConnWrapper) Upstream() any {
-	return w.Conn
+func (c *ExtendedConnWrapper) Upstream() any {
+	return c.Conn
 }
 
 func NewExtendedConn(conn net.Conn) N.ExtendedConn {

common/bufio/net_test.go

@@ -91,11 +91,7 @@ func newLargeDataPair() (chan hashPair, chan hashPair, func(t *testing.T) error)
 		var serverPair hashPair
 		var clientPair hashPair
 
-		for {
-			if pingOpen && pongOpen {
-				break
-			}
-
+		for !(pingOpen && pongOpen) {
 			select {
 			case serverPair, pingOpen = <-pingCh:
 				assert.True(t, pingOpen)

common/bufio/vectorised_unix.go

@@ -107,6 +107,7 @@ func (w *SyscallVectorisedPacketWriter) WriteVectorisedPacket(buffers []*buf.Buf
 			msg.SetIovlen(len(iovecList))
 		}
 		for {
+			//nolint:staticcheck
 			_, _, innerErr = unix.RawSyscall(unix.SYS_SENDMSG, fd, uintptr(unsafe.Pointer(&msg)), 0)
 			if innerErr == unix.EINTR {
 				continue

common/byteformats/json.go

@@ -164,11 +164,11 @@ type MemoryBytes struct {
 	rawBytes
 }
 
-func (b *MemoryBytes) Value() uint64 {
-	if b == nil {
+func (m *MemoryBytes) Value() uint64 {
+	if m == nil {
 		return 0
 	}
-	return b.value
+	return m.value
 }
 
 func (m *MemoryBytes) UnmarshalJSON(bytes []byte) error {

common/json/internal/contextjson/encode.go

@@ -307,6 +307,7 @@ func (e *encodeState) error(err error) {
 	panic(jsonError{err})
 }
 
+//nolint:staticcheck
 func isEmptyValue(v reflect.Value) bool {
 	switch v.Kind() {
 	case reflect.Array, reflect.Map, reflect.Slice, reflect.String:

common/network/handshake.go

@@ -38,11 +38,9 @@ func CloseOnHandshakeFailure(reporter io.Closer, onClose CloseHandlerFunc, err e
 		if handshakeConn, isHandshakeConn := common.Cast[HandshakeFailure](reporter); isHandshakeConn {
 			hErr := handshakeConn.HandshakeFailure(err)
 			err = E.Append(err, hErr, func(err error) error {
-				if closer, isCloser := reporter.(io.Closer); isCloser {
-					err = E.Append(err, closer.Close(), func(err error) error {
-						return E.Cause(err, "close")
-					})
-				}
+				err = E.Append(err, reporter.Close(), func(err error) error {
+					return E.Cause(err, "close")
+				})
 				return E.Cause(err, "write handshake failure")
 			})
 		} else {

common/network/thread.go

@@ -77,10 +77,7 @@ type LazyHeadroom interface {
 
 func CalculateFrontHeadroom(writer any) int {
 	var headroom int
-	for {
-		if writer == nil {
-			break
-		}
+	for writer != nil {
 		if lazyRoom, isLazy := writer.(LazyHeadroom); isLazy && lazyRoom.LazyHeadroom() {
 			return DefaultHeadroom
 		}
@@ -100,10 +97,7 @@ func CalculateFrontHeadroom(writer any) int {
 
 func calculateReaderFrontHeadroom(reader any) int {
 	var headroom int
-	for {
-		if reader == nil {
-			break
-		}
+	for reader != nil {
 		if lazyRoom, isLazy := reader.(LazyHeadroom); isLazy && lazyRoom.LazyHeadroom() {
 			return DefaultHeadroom
 		}
@@ -123,10 +117,7 @@ func calculateReaderFrontHeadroom(reader any) int {
 
 func CalculateRearHeadroom(writer any) int {
 	var headroom int
-	for {
-		if writer == nil {
-			break
-		}
+	for writer != nil {
 		if lazyRoom, isLazy := writer.(LazyHeadroom); isLazy && lazyRoom.LazyHeadroom() {
 			return DefaultHeadroom
 		}
@@ -168,10 +159,7 @@ func CalculateMTU(reader any, writer any) int {
 
 func calculateReaderMTU(reader any) int {
 	var mtu int
-	for {
-		if reader == nil {
-			break
-		}
+	for reader != nil {
 		if lazyRoom, isLazy := reader.(LazyHeadroom); isLazy && lazyRoom.LazyHeadroom() {
 			return 0
 		}
@@ -194,10 +182,7 @@ func calculateReaderMTU(reader any) int {
 
 func calculateWriterMTU(writer any) int {
 	var mtu int
-	for {
-		if writer == nil {
-			break
-		}
+	for writer != nil {
 		if lazyRoom, isLazy := writer.(LazyHeadroom); isLazy && lazyRoom.LazyHeadroom() {
 			return 0
 		}