Просмотр исходного кода

Add gofumpt as formatter

tags/v2.0.0-rc1
9seconds 5 лет назад
Родитель
Сommit
ef87d031ed
4 измененных файлов: 23 добавлений и 4 удалений
  1. 10
    1
      Makefile
  2. 3
    0
      go.mod
  3. 9
    2
      go.sum
  4. 1
    1
      mtglib/network/default_test.go

+ 10
- 1
Makefile Просмотреть файл

44
 vendor: go.mod go.sum
44
 vendor: go.mod go.sum
45
 	@$(MOD_ON) go mod vendor
45
 	@$(MOD_ON) go mod vendor
46
 
46
 
47
+.PHONY: fmt
48
+fmt:
49
+	@$(GOTOOL) gofumpt -w -s -extra "$(ROOT_DIR)"
50
+
47
 .PHONY: test
51
 .PHONY: test
48
 test:
52
 test:
49
 	@go test -v ./...
53
 	@go test -v ./...
74
 	@$(GOTOOL) godoc -http 0.0.0.0:10000
78
 	@$(GOTOOL) godoc -http 0.0.0.0:10000
75
 
79
 
76
 .PHONY: install-tools
80
 .PHONY: install-tools
77
-install-tools: install-tools-lint install-tools-godoc
81
+install-tools: install-tools-lint install-tools-godoc install-tools-gofumpt
78
 
82
 
79
 .PHONY: install-tools-lint
83
 .PHONY: install-tools-lint
80
 install-tools-lint:
84
 install-tools-lint:
87
 	@mkdir -p "$(GOBIN)" || true && \
91
 	@mkdir -p "$(GOBIN)" || true && \
88
 		$(GOTOOL) go get -u golang.org/x/tools/cmd/godoc
92
 		$(GOTOOL) go get -u golang.org/x/tools/cmd/godoc
89
 
93
 
94
+.PHONY: install-tools-gofumpt
95
+install-tools-gofumpt:
96
+	@mkdir -p "$(GOBIN)" || true && \
97
+		$(GOTOOL) go get -u mvdan.cc/gofumpt
98
+
90
 .PHONY: update-deps
99
 .PHONY: update-deps
91
 upgrade-deps:
100
 upgrade-deps:
92
 	$go get -u && go mod tidy
101
 	$go get -u && go mod tidy

+ 3
- 0
go.mod Просмотреть файл

5
 require (
5
 require (
6
 	github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
6
 	github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
7
 	github.com/babolivier/go-doh-client v0.0.0-20201028162107-a76cff4cb8b6
7
 	github.com/babolivier/go-doh-client v0.0.0-20201028162107-a76cff4cb8b6
8
+	github.com/kr/pretty v0.1.0 // indirect
8
 	github.com/libp2p/go-reuseport v0.0.2
9
 	github.com/libp2p/go-reuseport v0.0.2
9
 	github.com/mccutchen/go-httpbin v1.1.1
10
 	github.com/mccutchen/go-httpbin v1.1.1
10
 	github.com/pelletier/go-toml v1.8.1
11
 	github.com/pelletier/go-toml v1.8.1
11
 	github.com/stretchr/objx v0.3.0 // indirect
12
 	github.com/stretchr/objx v0.3.0 // indirect
12
 	github.com/stretchr/testify v1.7.0
13
 	github.com/stretchr/testify v1.7.0
13
 	golang.org/x/net v0.0.0-20210226172049-e18ecbb05110
14
 	golang.org/x/net v0.0.0-20210226172049-e18ecbb05110
15
+	golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4 // indirect
16
+	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
14
 )
17
 )

+ 9
- 2
go.sum Просмотреть файл

5
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
5
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
6
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
6
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
7
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
7
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
8
+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
9
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
10
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
11
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
12
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
8
 github.com/libp2p/go-reuseport v0.0.2 h1:XSG94b1FJfGA01BUrT82imejHQyTxO4jEWqheyCXYvU=
13
 github.com/libp2p/go-reuseport v0.0.2 h1:XSG94b1FJfGA01BUrT82imejHQyTxO4jEWqheyCXYvU=
9
 github.com/libp2p/go-reuseport v0.0.2/go.mod h1:SPD+5RwGC7rcnzngoYC86GjPzjSywuQyMVAheVBD9nQ=
14
 github.com/libp2p/go-reuseport v0.0.2/go.mod h1:SPD+5RwGC7rcnzngoYC86GjPzjSywuQyMVAheVBD9nQ=
10
 github.com/mccutchen/go-httpbin v1.1.1 h1:aEws49HEJEyXHLDnshQVswfUlCVoS8g6h9YaDyaW7RE=
15
 github.com/mccutchen/go-httpbin v1.1.1 h1:aEws49HEJEyXHLDnshQVswfUlCVoS8g6h9YaDyaW7RE=
25
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw=
30
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw=
26
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
31
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
27
 golang.org/x/sys v0.0.0-20190228124157-a34e9553db1e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
32
 golang.org/x/sys v0.0.0-20190228124157-a34e9553db1e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
28
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw=
29
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
33
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
34
+golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4 h1:myAQVi0cGEoqQVR5POX+8RR2mrocKqNN1hmeMqhX27k=
35
+golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
30
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
36
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
31
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
37
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
32
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
38
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
33
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
34
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
39
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
40
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
41
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
35
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
42
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
36
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
43
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
37
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
44
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

+ 1
- 1
mtglib/network/default_test.go Просмотреть файл

71
 	resp, err := httpClient.Get(suite.MakeURL("/get"))
71
 	resp, err := httpClient.Get(suite.MakeURL("/get"))
72
 
72
 
73
 	suite.NoError(err)
73
 	suite.NoError(err)
74
-    suite.Equal(http.StatusOK, resp.StatusCode)
74
+	suite.Equal(http.StatusOK, resp.StatusCode)
75
 }
75
 }
76
 
76
 
77
 func TestDefaultDialer(t *testing.T) {
77
 func TestDefaultDialer(t *testing.T) {

Загрузка…
Отмена
Сохранить