package/tun2socks
1
0
Fork 0
mirror of https://github.com/xjasonlyu/tun2socks.git synced 2025-10-07 17:51:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Style: use gofumpt for fmt

Browse Source
This commit is contained in:
xjasonlyu
2022-01-29 17:26:24 +08:00
parent 1d229ac859
commit e23837aa6d
8 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/go.yml vendored
View File

@@ -34,6 +34,5 @@ jobs:
- name: Get dependencies, run test and static check - name: Get dependencies, run test and static check
run: | run: |
go test ./... go test ./...
go vet ./... go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
go install honnef.co/go/tools/cmd/staticcheck@latest golangci-lint run --disable-all -E govet -E gofumpt -E megacheck ./...
staticcheck -- $(go list ./...)

3
Makefile
View File

@@ -151,5 +151,8 @@ all-arch: $(UNIX_ARCH_LIST) $(WINDOWS_ARCH_LIST)
releases: $(unix_releases) $(windows_releases) releases: $(unix_releases) $(windows_releases)
lint:
golangci-lint run --disable-all -E govet -E gofumpt -E megacheck ./...
clean: clean:
rm -rf $(BUILD_DIR) rm -rf $(BUILD_DIR)

2
common/observable/observable_test.go
View File

@@ -38,7 +38,7 @@ func TestObservable_MultiSubscribe(t *testing.T) {
src := NewObservable(iter) src := NewObservable(iter)
ch1, _ := src.Subscribe() ch1, _ := src.Subscribe()
ch2, _ := src.Subscribe() ch2, _ := src.Subscribe()
var count = atomic.NewInt32(0) count := atomic.NewInt32(0)
var wg sync.WaitGroup var wg sync.WaitGroup
wg.Add(2) wg.Add(2)

1
common/pool/alloc.go
View File

@@ -52,6 +52,7 @@ func (alloc *Allocator) Put(buf []byte) error {
} }
//lint:ignore SA6002 ignore temporarily //lint:ignore SA6002 ignore temporarily
//nolint
alloc.buffers[b].Put(buf) alloc.buffers[b].Put(buf)
return nil return nil
} }

4
component/dialer/control.go
View File

@@ -8,9 +8,7 @@ import (
type controlFunc func(string, string, syscall.RawConn) error type controlFunc func(string, string, syscall.RawConn) error
var ( var _controlPool = make([]controlFunc, 0, 2)
_controlPool = make([]controlFunc, 0, 2)
)
func addControl(f controlFunc) { func addControl(f controlFunc) {
_controlPool = append(_controlPool, f) _controlPool = append(_controlPool, f)

6
log/log.go
View File

@@ -7,10 +7,8 @@ import (
"go.uber.org/atomic" "go.uber.org/atomic"
) )
var ( // _defaultLevel is package default logging level.
// _defaultLevel is package default logging level. var _defaultLevel = atomic.NewUint32(uint32(InfoLevel))
_defaultLevel = atomic.NewUint32(uint32(InfoLevel))
)
func init() { func init() {
logrus.SetOutput(os.Stdout) logrus.SetOutput(os.Stdout)

4
proxy/proxy.go
View File

@@ -14,9 +14,7 @@ const (
tcpConnectTimeout = 5 * time.Second tcpConnectTimeout = 5 * time.Second
) )
var ( var _defaultDialer Dialer = &Base{}
_defaultDialer Dialer = &Base{}
)
type Dialer interface { type Dialer interface {
DialContext(context.Context, *M.Metadata) (net.Conn, error) DialContext(context.Context, *M.Metadata) (net.Conn, error)

2
proxy/socks5.go
View File

@@ -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) { func (ss *Socks5) DialContext(ctx context.Context, metadata *M.Metadata) (c net.Conn, err error) {
var network = "tcp" network := "tcp"
if ss.unix { if ss.unix {
network = "unix" network = "unix"
} }