Simplify error messages

z/cmd.go

@@ -298,22 +298,22 @@ func (x *Cmd) Run() {
 
 	switch {
 	case len(args) > 0 && cmd.NoArgs:
-		ExitError(TooManyArgs{cmd})
+		ExitError(TooManyArgs{len(args), 0})
 		return
 	case len(args) < cmd.MinArgs:
-		ExitError(NotEnoughArgs{cmd})
+		ExitError(NotEnoughArgs{len(args), cmd.MinArgs})
 		return
 	case cmd.MaxArgs > 0 && len(args) > cmd.MaxArgs:
-		ExitError(TooManyArgs{cmd})
+		ExitError(TooManyArgs{len(args), cmd.MaxArgs})
 		return
 	case cmd.NumArgs > 0 && len(args) != cmd.NumArgs:
-		ExitError(WrongNumArgs{cmd})
+		ExitError(WrongNumArgs{len(args), cmd.NumArgs})
 		return
 	case cmd.UseConf && Conf == nil:
-		ExitError(UsesConf{cmd})
+		ExitError(UsesConf{})
 		return
 	case cmd.UseVars && Vars == nil:
-		ExitError(UsesVars{cmd})
+		ExitError(UsesVars{})
 		return
 	}
 

z/errors.go

@@ -3,36 +3,33 @@ package Z
 import "fmt"
 
 type NotEnoughArgs struct {
-	Cmd *Cmd
+	Count int
+	Min   int
 }
 
 func (e NotEnoughArgs) Error() string {
 	return fmt.Sprintf(
-		"usage: %v %v (not enough args, %v required)",
+		"error: %v is not enough args, %v required", e.Count, e.Min)
-		e.Cmd.Name, e.Cmd.GetUsage(), e.Cmd.MinArgs,
-	)
 }
 
 type TooManyArgs struct {
-	Cmd *Cmd
+	Count int
+	Max   int
 }
 
 func (e TooManyArgs) Error() string {
 	return fmt.Sprintf(
-		"usage: %v %v (too many args, %v maximum)",
+		"error: %v is too many args, %v maximum", e.Count, e.Max)
-		e.Cmd.Name, e.Cmd.GetUsage(), e.Cmd.MaxArgs,
-	)
 }
 
 type WrongNumArgs struct {
-	Cmd *Cmd
+	Count int
+	Num   int
 }
 
 func (e WrongNumArgs) Error() string {
 	return fmt.Sprintf(
-		"usage: %v %v (wrong number of args, %v required)",
+		"error: %v is wrong number of args, %v required", e.Count, e.Num)
-		e.Cmd.Name, e.Cmd.GetUsage(), e.Cmd.NumArgs,
-	)
 }
 
 type MissingConf struct {