Skip to content

Commit 21021b2

Browse files
authored
Merge pull request #19085 from ivanvc/remove-receiver-name-check
scripts: remove receiver name check
2 parents b531071 + d2d1678 commit 21021b2

File tree

2 files changed

+1
-28
lines changed

2 files changed

+1
-28
lines changed

Makefile

+1-5
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ fuzz:
6565
# Static analysis
6666
.PHONY: verify
6767
verify: verify-gofmt verify-bom verify-lint verify-dep verify-shellcheck verify-goword \
68-
verify-govet verify-license-header verify-receiver-name verify-mod-tidy \
68+
verify-govet verify-license-header verify-mod-tidy \
6969
verify-shellws verify-proto-annotations verify-genproto verify-yamllint \
7070
verify-govet-shadow verify-markdown-marker verify-go-versions
7171

@@ -113,10 +113,6 @@ verify-govet:
113113
verify-license-header:
114114
PASSES="license_header" ./scripts/test.sh
115115

116-
.PHONY: verify-receiver-name
117-
verify-receiver-name:
118-
PASSES="receiver_name" ./scripts/test.sh
119-
120116
.PHONY: verify-mod-tidy
121117
verify-mod-tidy:
122118
PASSES="mod_tidy" ./scripts/test.sh

scripts/test.sh

-23
Original file line numberDiff line numberDiff line change
@@ -433,29 +433,6 @@ function license_header_pass {
433433
run_for_modules generic_checker license_header_per_module
434434
}
435435

436-
function receiver_name_for_package {
437-
# bash 3.x compatible replacement of: mapfile -t gofiles < <(go_srcs_in_module)
438-
local gofiles=()
439-
while IFS= read -r line; do gofiles+=("$line"); done < <(go_srcs_in_module)
440-
441-
recvs=$(grep 'func ([^*]' "${gofiles[@]}" | tr ':' ' ' | \
442-
awk ' { print $2" "$3" "$4" "$1 }' | sed "s/[a-zA-Z\\.]*go//g" | sort | uniq | \
443-
grep -Ev "(Descriptor|Proto|_)" | awk ' { print $3" "$4 } ' | sort | uniq -c | grep -v ' 1 ' | awk ' { print $2 } ')
444-
if [ -n "${recvs}" ]; then
445-
# shellcheck disable=SC2206
446-
recvs=($recvs)
447-
for recv in "${recvs[@]}"; do
448-
log_error "Mismatched receiver for $recv..."
449-
grep "$recv" "${gofiles[@]}" | grep 'func ('
450-
done
451-
return 255
452-
fi
453-
}
454-
455-
function receiver_name_pass {
456-
run_for_modules receiver_name_for_package
457-
}
458-
459436
# goword_for_package package
460437
# checks spelling and comments in the 'package' in the current module
461438
#

0 commit comments

Comments
 (0)