From 625a15e03b009629e581559cbf1159db1529f59a Mon Sep 17 00:00:00 2001 From: Loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com> Date: Sat, 1 May 2021 11:15:39 +0800 Subject: [PATCH] Chore: format code by new customized goimports (#950) --- app/browserforwarder/forwarder.go | 3 +-- app/dns/fakedns/fakedns_test.go | 3 +-- app/dns/nameserver_udp.go | 3 +-- app/router/strategy_leastping.go | 3 +-- infra/control/main/main.go | 1 - transport/internet/headers/http/linkedreadRequest.go | 1 - transport/internet/websocket/dialer.go | 5 ++--- 7 files changed, 6 insertions(+), 13 deletions(-) diff --git a/app/browserforwarder/forwarder.go b/app/browserforwarder/forwarder.go index 12e03fbb4..a95ae7b67 100644 --- a/app/browserforwarder/forwarder.go +++ b/app/browserforwarder/forwarder.go @@ -9,13 +9,12 @@ import ( "net/http" "time" - "github.com/v2fly/v2ray-core/v4/features/extension" - "github.com/v2fly/BrowserBridge/handler" "github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v4/common/platform/securedload" + "github.com/v2fly/v2ray-core/v4/features/extension" "github.com/v2fly/v2ray-core/v4/transport/internet" ) diff --git a/app/dns/fakedns/fakedns_test.go b/app/dns/fakedns/fakedns_test.go index c19f55dde..b36747cdb 100644 --- a/app/dns/fakedns/fakedns_test.go +++ b/app/dns/fakedns/fakedns_test.go @@ -1,9 +1,8 @@ package fakedns import ( - "testing" - gonet "net" + "testing" "github.com/stretchr/testify/assert" diff --git a/app/dns/nameserver_udp.go b/app/dns/nameserver_udp.go index 914ac29c7..8fcc558ab 100644 --- a/app/dns/nameserver_udp.go +++ b/app/dns/nameserver_udp.go @@ -9,10 +9,9 @@ import ( "sync/atomic" "time" - core "github.com/v2fly/v2ray-core/v4" - "golang.org/x/net/dns/dnsmessage" + core "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v4/common/protocol/dns" diff --git a/app/router/strategy_leastping.go b/app/router/strategy_leastping.go index d5a62039e..cc0139547 100644 --- a/app/router/strategy_leastping.go +++ b/app/router/strategy_leastping.go @@ -6,9 +6,8 @@ import ( "context" core "github.com/v2fly/v2ray-core/v4" - "github.com/v2fly/v2ray-core/v4/common" - "github.com/v2fly/v2ray-core/v4/app/observatory" + "github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v4/features/extension" ) diff --git a/infra/control/main/main.go b/infra/control/main/main.go index 4d35be5f8..8c28fdde0 100644 --- a/infra/control/main/main.go +++ b/infra/control/main/main.go @@ -6,7 +6,6 @@ import ( "os" commlog "github.com/v2fly/v2ray-core/v4/common/log" - // _ "github.com/v2fly/v2ray-core/v4/infra/conf/command" "github.com/v2fly/v2ray-core/v4/infra/control" ) diff --git a/transport/internet/headers/http/linkedreadRequest.go b/transport/internet/headers/http/linkedreadRequest.go index a6776095e..6d750567e 100644 --- a/transport/internet/headers/http/linkedreadRequest.go +++ b/transport/internet/headers/http/linkedreadRequest.go @@ -3,7 +3,6 @@ package http import ( "bufio" "net/http" - _ "unsafe" // required to use //go:linkname ) diff --git a/transport/internet/websocket/dialer.go b/transport/internet/websocket/dialer.go index b1c0a6d58..1987ab423 100644 --- a/transport/internet/websocket/dialer.go +++ b/transport/internet/websocket/dialer.go @@ -9,14 +9,13 @@ import ( "io" "time" - "github.com/v2fly/v2ray-core/v4/features/extension" - "github.com/gorilla/websocket" - core "github.com/v2fly/v2ray-core/v4" + core "github.com/v2fly/v2ray-core/v4" "github.com/v2fly/v2ray-core/v4/common" "github.com/v2fly/v2ray-core/v4/common/net" "github.com/v2fly/v2ray-core/v4/common/session" + "github.com/v2fly/v2ray-core/v4/features/extension" "github.com/v2fly/v2ray-core/v4/transport/internet" "github.com/v2fly/v2ray-core/v4/transport/internet/tls" )