From e23837aa6d5cb2874c2394ee07547706ab187d4d Mon Sep 17 00:00:00 2001
From: xjasonlyu <xjasonlyu@gmail.com>
Date: Sat, 29 Jan 2022 17:26:24 +0800
Subject: [PATCH] Style: use gofumpt for fmt

---
 .github/workflows/go.yml             | 5 ++---
 Makefile                             | 3 +++
 common/observable/observable_test.go | 2 +-
 common/pool/alloc.go                 | 1 +
 component/dialer/control.go          | 4 +---
 log/log.go                           | 6 ++----
 proxy/proxy.go                       | 4 +---
 proxy/socks5.go                      | 2 +-
 8 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index beb3c98..f599dee 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -34,6 +34,5 @@ jobs:
       - name: Get dependencies, run test and static check
         run: |
           go test ./...
-          go vet ./...
-          go install honnef.co/go/tools/cmd/staticcheck@latest
-          staticcheck -- $(go list ./...)
+          go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
+          golangci-lint run --disable-all -E govet -E gofumpt -E megacheck ./...
diff --git a/Makefile b/Makefile
index ab592c9..67dd407 100644
--- a/Makefile
+++ b/Makefile
@@ -151,5 +151,8 @@ all-arch: $(UNIX_ARCH_LIST) $(WINDOWS_ARCH_LIST)
 
 releases: $(unix_releases) $(windows_releases)
 
+lint:
+	golangci-lint run --disable-all -E govet -E gofumpt -E megacheck ./...
+
 clean:
 	rm -rf $(BUILD_DIR)
diff --git a/common/observable/observable_test.go b/common/observable/observable_test.go
index 5a9e6d3..ec3c3f5 100755
--- a/common/observable/observable_test.go
+++ b/common/observable/observable_test.go
@@ -38,7 +38,7 @@ func TestObservable_MultiSubscribe(t *testing.T) {
 	src := NewObservable(iter)
 	ch1, _ := src.Subscribe()
 	ch2, _ := src.Subscribe()
-	var count = atomic.NewInt32(0)
+	count := atomic.NewInt32(0)
 
 	var wg sync.WaitGroup
 	wg.Add(2)
diff --git a/common/pool/alloc.go b/common/pool/alloc.go
index 1f0a912..b395ad4 100755
--- a/common/pool/alloc.go
+++ b/common/pool/alloc.go
@@ -52,6 +52,7 @@ func (alloc *Allocator) Put(buf []byte) error {
 	}
 
 	//lint:ignore SA6002 ignore temporarily
+	//nolint
 	alloc.buffers[b].Put(buf)
 	return nil
 }
diff --git a/component/dialer/control.go b/component/dialer/control.go
index fbdf427..14304fb 100644
--- a/component/dialer/control.go
+++ b/component/dialer/control.go
@@ -8,9 +8,7 @@ import (
 
 type controlFunc func(string, string, syscall.RawConn) error
 
-var (
-	_controlPool = make([]controlFunc, 0, 2)
-)
+var _controlPool = make([]controlFunc, 0, 2)
 
 func addControl(f controlFunc) {
 	_controlPool = append(_controlPool, f)
diff --git a/log/log.go b/log/log.go
index bdf5e24..d84e36f 100755
--- a/log/log.go
+++ b/log/log.go
@@ -7,10 +7,8 @@ import (
 	"go.uber.org/atomic"
 )
 
-var (
-	// _defaultLevel is package default logging level.
-	_defaultLevel = atomic.NewUint32(uint32(InfoLevel))
-)
+// _defaultLevel is package default logging level.
+var _defaultLevel = atomic.NewUint32(uint32(InfoLevel))
 
 func init() {
 	logrus.SetOutput(os.Stdout)
diff --git a/proxy/proxy.go b/proxy/proxy.go
index ab1f13d..e525136 100755
--- a/proxy/proxy.go
+++ b/proxy/proxy.go
@@ -14,9 +14,7 @@ const (
 	tcpConnectTimeout = 5 * time.Second
 )
 
-var (
-	_defaultDialer Dialer = &Base{}
-)
+var _defaultDialer Dialer = &Base{}
 
 type Dialer interface {
 	DialContext(context.Context, *M.Metadata) (net.Conn, error)
diff --git a/proxy/socks5.go b/proxy/socks5.go
index a9e1810..0301f2b 100755
--- a/proxy/socks5.go
+++ b/proxy/socks5.go
@@ -38,7 +38,7 @@ func NewSocks5(addr, user, pass string) (*Socks5, error) {
 }
 
 func (ss *Socks5) DialContext(ctx context.Context, metadata *M.Metadata) (c net.Conn, err error) {
-	var network = "tcp"
+	network := "tcp"
 	if ss.unix {
 		network = "unix"
 	}