From e8d8805cd203c67bc89dcf006eab91914cd6d492 Mon Sep 17 00:00:00 2001 From: filifa Date: Sun, 28 Jul 2024 23:18:21 -0500 Subject: [PATCH] don't print flag name again --- cmd/leagueflag.go | 2 +- cmd/sportflag.go | 2 +- cmd/teamflag.go | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/leagueflag.go b/cmd/leagueflag.go index 3a1f024..fbbfdf8 100644 --- a/cmd/leagueflag.go +++ b/cmd/leagueflag.go @@ -50,7 +50,7 @@ func (t *leagueFlag) Set(v string) error { _, ok := leagueIDs[v] if !ok { allowed := keys(leagueIDs) - err = flagValueError("league", allowed) + err = flagValueError(allowed) } else { *t = leagueFlag(v) } diff --git a/cmd/sportflag.go b/cmd/sportflag.go index 440d97e..bce07b4 100644 --- a/cmd/sportflag.go +++ b/cmd/sportflag.go @@ -55,7 +55,7 @@ func (t *sportFlag) Set(v string) error { _, ok := sportIDs[v] if !ok { allowed := keys(sportIDs) - err = flagValueError("sport", allowed) + err = flagValueError(allowed) } else { *t = sportFlag(v) } diff --git a/cmd/teamflag.go b/cmd/teamflag.go index 97e458f..835a157 100644 --- a/cmd/teamflag.go +++ b/cmd/teamflag.go @@ -68,10 +68,10 @@ func keys[V any](m map[string]V) []string { return keys } -func flagValueError(name string, allowed []string) error { +func flagValueError(allowed []string) error { sort.Strings(allowed) allowedList := strings.Join(allowed, ", ") - return errors.New(name + " must be one of " + allowedList) + return errors.New("must be one of " + allowedList) } type teamFlag string @@ -87,7 +87,7 @@ func (t *teamFlag) Set(v string) error { _, ok := teamIDs[v] if !ok { allowed := keys(teamIDs) - err = flagValueError("team", allowed) + err = flagValueError(allowed) } else { *t = teamFlag(v) }