Skip to content

Commit 2811b23

Browse files
ivanvcivanvc
committed
Remove goword linter
This is replaced by golangci-lint's misspell. Signed-off-by: Ivan Valdes <[email protected]>
1 parent 51a8be0 commit 2811b23

File tree

5 files changed

+1
-45
lines changed

5 files changed

+1
-45
lines changed

‎Makefile‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ fuzz:
9696

9797
# Static analysis
9898
.PHONY: verify
99-
verify: verify-gofmt verify-bom verify-lint verify-dep verify-shellcheck verify-goword \
99+
verify: verify-gofmt verify-bom verify-lint verify-dep verify-shellcheck \
100100
verify-license-header verify-mod-tidy \
101101
verify-shellws verify-proto-annotations verify-genproto verify-yamllint \
102102
verify-markdown-marker verify-go-versions verify-gomodguard \
@@ -134,10 +134,6 @@ fix-lint:
134134
verify-shellcheck:
135135
PASSES="shellcheck" ./scripts/test.sh
136136

137-
.PHONY: verify-goword
138-
verify-goword:
139-
PASSES="goword" ./scripts/test.sh
140-
141137
.PHONY: verify-license-header
142138
verify-license-header:
143139
PASSES="license_header" ./scripts/test.sh

‎scripts/test.sh‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -421,36 +421,6 @@ function license_header_pass {
421421
run_for_modules generic_checker license_header_per_module
422422
}
423423

424-
# goword_for_package package
425-
# checks spelling and comments in the 'package' in the current module
426-
#
427-
function goword_for_package {
428-
# bash 3.x compatible replacement of: mapfile -t gofiles < <(go_srcs_in_module)
429-
local gofiles=()
430-
while IFS= read -r line; do gofiles+=("$line"); done < <(go_srcs_in_module)
431-
432-
local gowordRes
433-
434-
# spellchecking can be enabled with GOBINARGS="--tags=spell"
435-
# but it requires heavy dependencies installation, like:
436-
# apt-get install libaspell-dev libhunspell-dev hunspell-en-us aspell-en
437-
438-
# only check for broke exported godocs
439-
if gowordRes=$(run_go_tool "github.com/chzchzchz/goword" -use-spell=false "${gofiles[@]}" | grep godoc-export | sort); then
440-
log_error -e "goword checking failed:\\n${gowordRes}"
441-
return 255
442-
fi
443-
if [ -n "$gowordRes" ]; then
444-
log_error -e "goword checking returned output:\\n${gowordRes}"
445-
return 255
446-
fi
447-
}
448-
449-
450-
function goword_pass {
451-
run_for_modules goword_for_package || return 255
452-
}
453-
454424
function go_fmt_for_package {
455425
# We utilize 'go fmt' to find all files suitable for formatting,
456426
# but reuse full power gofmt to perform just RO check.

‎tools/mod/go.mod‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ toolchain go1.25.3
77
require (
88
github.com/alexfalkowski/gocovmerge v1.11.0
99
github.com/appscodelabs/license-bill-of-materials v0.0.0-20220707232035-6018e0c5287c
10-
github.com/chzchzchz/goword v0.0.0-20170907005317-a9744cb52b03
1110
github.com/cloudflare/cfssl v1.6.5
1211
github.com/gogo/protobuf v1.3.2
1312
github.com/golangci/golangci-lint/v2 v2.5.0
@@ -43,7 +42,6 @@ require (
4342
github.com/Masterminds/semver/v3 v3.3.1 // indirect
4443
github.com/MirrexOne/unqueryvet v1.2.1 // indirect
4544
github.com/OpenPeeDeeP/depguard/v2 v2.2.1 // indirect
46-
github.com/akhenakh/hunspellgo v0.0.0-20160221122622-9db38fa26e19 // indirect
4745
github.com/alecthomas/chroma/v2 v2.20.0 // indirect
4846
github.com/alecthomas/go-check-sumtype v0.3.1 // indirect
4947
github.com/alexkohler/nakedret/v2 v2.0.6 // indirect
@@ -214,7 +212,6 @@ require (
214212
github.com/timonwong/loggercheck v0.11.0 // indirect
215213
github.com/tomarrell/wrapcheck/v2 v2.11.0 // indirect
216214
github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
217-
github.com/trustmaster/go-aspell v0.0.0-20200701131845-c2b1f55bec8f // indirect
218215
github.com/ultraware/funlen v0.2.0 // indirect
219216
github.com/ultraware/whitespace v0.2.0 // indirect
220217
github.com/uudashr/gocognit v1.2.0 // indirect

‎tools/mod/go.sum‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ github.com/MirrexOne/unqueryvet v1.2.1/go.mod h1:IWwCwMQlSWjAIteW0t+28Q5vouyktfu
3636
github.com/OpenPeeDeeP/depguard/v2 v2.2.1 h1:vckeWVESWp6Qog7UZSARNqfu/cZqvki8zsuj3piCMx4=
3737
github.com/OpenPeeDeeP/depguard/v2 v2.2.1/go.mod h1:q4DKzC4UcVaAvcfd41CZh0PWpGgzrVxUYBlgKNGquUo=
3838
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8/go.mod h1:I0gYDMZ6Z5GRU7l58bNFSkPTFN6Yl12dsUlAZ8xy98g=
39-
github.com/akhenakh/hunspellgo v0.0.0-20160221122622-9db38fa26e19 h1:bYOD6QJnBJY79MJQR1i9cyQePG5oNDZXDKL2bhN/uvE=
40-
github.com/akhenakh/hunspellgo v0.0.0-20160221122622-9db38fa26e19/go.mod h1:HcqyLXmWoESd/vPSbCPqvgw5l5cMM5PtoqFOnXLjSeM=
4139
github.com/alecthomas/assert/v2 v2.11.0 h1:2Q9r3ki8+JYXvGsDyBXwH3LcJ+WK5D0gc5E8vS6K3D0=
4240
github.com/alecthomas/assert/v2 v2.11.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k=
4341
github.com/alecthomas/chroma/v2 v2.20.0 h1:sfIHpxPyR07/Oylvmcai3X/exDlE8+FA820NTz+9sGw=
@@ -108,8 +106,6 @@ github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd h1:vy0G
108106
github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd/go.mod h1:xe0nKWGd3eJgtqZRaN9RjMtK7xUYchjzPr7q6kcvCCs=
109107
github.com/charmbracelet/x/term v0.2.1 h1:AQeHeLZ1OqSXhrAWpYUtZyX1T3zVxfpZuEQMIQaGIAQ=
110108
github.com/charmbracelet/x/term v0.2.1/go.mod h1:oQ4enTYFV7QN4m0i9mzHrViD7TQKvNEEkHUMCmsxdUg=
111-
github.com/chzchzchz/goword v0.0.0-20170907005317-a9744cb52b03 h1:0wUHjDfbCAROEAZ96zAJGwcNMkPIheFaIjtQyv3QqfM=
112-
github.com/chzchzchz/goword v0.0.0-20170907005317-a9744cb52b03/go.mod h1:uFE9hX+zXEwvyUThZ4gDb9vkAwc5DoHUnRSEpH0VrOs=
113109
github.com/ckaznocha/intrange v0.3.1 h1:j1onQyXvHUsPWujDH6WIjhyH26gkRt/txNlV7LspvJs=
114110
github.com/ckaznocha/intrange v0.3.1/go.mod h1:QVepyz1AkUoFQkpEqksSYpNpUo3c5W7nWh/s6SHIJJk=
115111
github.com/cloudflare/cfssl v1.6.5 h1:46zpNkm6dlNkMZH/wMW22ejih6gIaJbzL2du6vD7ZeI=
@@ -494,8 +490,6 @@ github.com/tomarrell/wrapcheck/v2 v2.11.0 h1:BJSt36snX9+4WTIXeJ7nvHBQBcm1h2SjQMS
494490
github.com/tomarrell/wrapcheck/v2 v2.11.0/go.mod h1:wFL9pDWDAbXhhPZZt+nG8Fu+h29TtnZ2MW6Lx4BRXIU=
495491
github.com/tommy-muehle/go-mnd/v2 v2.5.1 h1:NowYhSdyE/1zwK9QCLeRb6USWdoif80Ie+v+yU8u1Zw=
496492
github.com/tommy-muehle/go-mnd/v2 v2.5.1/go.mod h1:WsUAkMJMYww6l/ufffCD3m+P7LEvr8TnZn9lwVDlgzw=
497-
github.com/trustmaster/go-aspell v0.0.0-20200701131845-c2b1f55bec8f h1:92ZQJRegaqnKjz9HY9an696Sw5EmAqRv0eie/U2IE6k=
498-
github.com/trustmaster/go-aspell v0.0.0-20200701131845-c2b1f55bec8f/go.mod h1:wxUiQ1klFJmwnM41kQI7IT2g8jjOKbtuL54LdjkxAI0=
499493
github.com/ultraware/funlen v0.2.0 h1:gCHmCn+d2/1SemTdYMiKLAHFYxTYz7z9VIDRaTGyLkI=
500494
github.com/ultraware/funlen v0.2.0/go.mod h1:ZE0q4TsJ8T1SQcjmkhN/w+MceuatI6pBFSxxyteHIJA=
501495
github.com/ultraware/whitespace v0.2.0 h1:TYowo2m9Nfj1baEQBjuHzvMRbp19i+RCcRYrSWoFa+g=

‎tools/mod/tools.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ package tools
2323
import (
2424
_ "github.com/alexfalkowski/gocovmerge"
2525
_ "github.com/appscodelabs/license-bill-of-materials"
26-
_ "github.com/chzchzchz/goword"
2726
_ "github.com/cloudflare/cfssl/cmd/cfssl"
2827
_ "github.com/cloudflare/cfssl/cmd/cfssljson"
2928
_ "github.com/golangci/golangci-lint/v2/cmd/golangci-lint"

0 commit comments

Comments
 (0)