choice: removed MatchS

Author: rsteube

pkg/choices/choice.go

@@ -21,11 +21,12 @@ func (c Choice) Format() string {
 	return s
 }
 
-func (c *Choice) Match(other Choice) bool {
+func (c *Choice) Match(s string) bool {
 	if c == nil {
 		return false
 	}
 
+	other := Parse(s)
 	switch {
 	case c.Name != "" && c.Name != other.Name,
 		c.Variant != "" && c.Variant != other.Variant,
@@ -35,13 +36,6 @@ func (c *Choice) Match(other Choice) bool {
 	return true
 }
 
-func (c *Choice) MatchS(s string) bool {
-	if c == nil {
-		return false
-	}
-	return c.Match(Parse(s))
-}
-
 func Parse(s string) Choice {
 	nameVariant, group, _ := strings.Cut(s, "@")
 	cName, variant, _ := strings.Cut(nameVariant, "/")