Update lint and fix new lint errors

Author: erikdubbelboer

.github/workflows/lint.yml

@@ -25,5 +25,5 @@ jobs:
     - name: Run golangci-lint
       uses: golangci/golangci-lint-action@v8
       with:
-        version: v2.4.0
+        version: v2.5.0
         args: --verbose

brotli.go

@@ -17,8 +17,8 @@ const (
 	CompressBrotliBestSpeed       = brotli.BestSpeed
 	CompressBrotliBestCompression = brotli.BestCompression
 
-	// Choose a default brotli compression level comparable to
-	// CompressDefaultCompression (gzip 6)
+	// CompressBrotliDefaultCompression chooses a default brotli compression level comparable to
+	// CompressDefaultCompression (gzip 6).
 	// See: https://github.com/valyala/fasthttp/issues/798#issuecomment-626293806
 	CompressBrotliDefaultCompression = 4
 )

client.go

@@ -924,7 +924,7 @@ type clientConn struct {
 	lastUseTime time.Time
 }
 
-// CreatedTime returns net.Conn the client.
+// Conn returns the underlying net.Conn associated with the client connection.
 func (cc *clientConn) Conn() net.Conn {
 	return cc.c
 }
@@ -1115,7 +1115,7 @@ var (
 	// exceed the max count.
 	ErrTooManyRedirects = errors.New("too many redirects detected when doing the request")
 
-	// HostClients are only able to follow redirects to the same protocol.
+	// ErrHostClientRedirectToDifferentScheme is returned when a HostClient follows a redirect to a different protocol.
 	ErrHostClientRedirectToDifferentScheme = errors.New("HostClient can't follow redirects to a different protocol," +
 		" please use Client instead")
 )
@@ -1522,7 +1522,7 @@ func (e *timeoutError) Error() string {
 	return "timeout"
 }
 
-// Only implement the Timeout() function of the net.Error interface.
+// Timeout implements the Timeout behavior of the net.Error interface.
 // This allows for checks like:
 //
 //	if x, ok := err.(interface{ Timeout() bool }); ok && x.Timeout() {

fasthttpproxy/dialer.go

@@ -103,7 +103,7 @@ func (d *Dialer) GetDialFunc(useEnv bool) (dialFunc fasthttp.DialFunc, err error
 		case "socks5", "socks5h":
 			proxyDialer, err = proxy.FromURL(proxyURL, d)
 			if err != nil {
-				return
+				return nil, err
 			}
 		case "http":
 			proxyAddr, auth := addrAndAuth(proxyURL)
@@ -128,7 +128,7 @@ func (d *Dialer) GetDialFunc(useEnv bool) (dialFunc fasthttp.DialFunc, err error
 		reqURL := &url.URL{Host: addr, Scheme: scheme}
 		proxyURL, err = proxyFunc(reqURL)
 		if err != nil {
-			return
+			return nil, err
 		}
 		if proxyURL == nil {
 			// dial directly
@@ -138,7 +138,7 @@ func (d *Dialer) GetDialFunc(useEnv bool) (dialFunc fasthttp.DialFunc, err error
 		case "socks5", "socks5h":
 			proxyDialer, err = proxy.FromURL(proxyURL, d)
 			if err != nil {
-				return
+				return nil, err
 			}
 		case "http":
 			proxyAddr, auth := addrAndAuth(proxyURL)
@@ -167,7 +167,7 @@ func (d *Dialer) Dial(network, addr string) (conn net.Conn, err error) {
 		return d.TCPDialer.DialDualStack(addr)
 	}
 	err = errors.New("dont support the network: " + network)
-	return
+	return nil, err
 }
 
 func (d *Dialer) connectTimeout() time.Duration {
@@ -193,7 +193,7 @@ func (d DialerFunc) Dial(network, addr string) (net.Conn, error) {
 func httpProxyDial(dialer proxy.Dialer, network, addr, proxyAddr, auth string) (conn net.Conn, err error) {
 	conn, err = dialer.Dial(network, proxyAddr)
 	if err != nil {
-		return
+		return nil, err
 	}
 	var connectTimeout time.Duration
 	hp, ok := dialer.(httpProxyDialer)
@@ -218,21 +218,21 @@ func httpProxyDial(dialer proxy.Dialer, network, addr, proxyAddr, auth string) (
 	_, err = conn.Write([]byte(req))
 	if err != nil {
 		_ = conn.Close()
-		return
+		return nil, err
 	}
 	res := fasthttp.AcquireResponse()
 	defer fasthttp.ReleaseResponse(res)
 	res.SkipBody = true
 	if err = res.Read(bufio.NewReaderSize(conn, 1024)); err != nil {
 		_ = conn.Close()
-		return
+		return nil, err
 	}
 	if res.Header.StatusCode() != 200 {
 		_ = conn.Close()
 		err = fmt.Errorf("could not connect to proxyAddr: %s status code: %d", proxyAddr, res.Header.StatusCode())
-		return
+		return nil, err
 	}
-	return
+	return conn, err
 }
 
 // Cache authentication information for HTTP proxies.
@@ -244,7 +244,7 @@ type proxyInfo struct {
 func addrAndAuth(pu *url.URL) (proxyAddr, auth string) {
 	if pu.User == nil {
 		proxyAddr = pu.Host + pu.Path
-		return
+		return proxyAddr, auth
 	}
 	var info *proxyInfo
 	v, ok := authCache.Load(pu)

fasthttpproxy/dialer_test.go

@@ -273,7 +273,7 @@ func startProxyServer(t *testing.T, ports []string, counts []atomic.Int64) (lns
 			fasthttp.ReleaseRequest(req)
 		}()
 	}
-	return
+	return lns
 }
 
 func getDialer(httpProxy, httpsProxy, noProxy string) *Dialer {
@@ -290,7 +290,7 @@ func getCounts(counts []atomic.Int64) (r []int64) {
 	for i := 0; i < len(counts); i++ {
 		r = append(r, counts[i].Load())
 	}
-	return
+	return r
 }
 
 func countsEqual(a, b []int64) bool {

fasthttputil/pipeconns.go

@@ -229,7 +229,7 @@ func (e *timeoutError) Error() string {
 	return "timeout"
 }
 
-// Only implement the Timeout() function of the net.Error interface.
+// Timeout implements the Timeout method of the net.Error interface.
 // This allows for checks like:
 //
 //	if x, ok := err.(interface{ Timeout() bool }); ok && x.Timeout() {