From b65e57bed534b00350d091db1894fdff1c4230d5 Mon Sep 17 00:00:00 2001
From: muge <stevezhang2014@gmail.com>
Date: Mon, 16 May 2016 09:38:04 +0800
Subject: [PATCH] cli: remove unnecessary initErr type
Signed-off-by: ZhangHang <stevezhang2014@gmail.com>
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
---
cli/cli.go | 55 ++++++++++++++++++++++++++----------------------------
1 file changed, 26 insertions(+), 29 deletions(-)
diff --git a/cli/cli.go b/cli/cli.go
index 12649df6da..f6d48d6fac 100644
--- a/cli/cli.go
+++ b/cli/cli.go
@@ -39,12 +39,7 @@ func New(handlers ...Handler) *Cli {
return cli
}
-// initErr is an error returned upon initialization of a handler implementing Initializer.
-type initErr struct{ error }
-
-func (err initErr) Error() string {
- return err.Error()
-}
+var errCommandNotFound = errors.New("command not found")
func (cli *Cli) command(args ...string) (func(...string) error, error) {
for _, c := range cli.handlers {
@@ -54,35 +49,36 @@ func (cli *Cli) command(args ...string) (func(...string) error, error) {
if cmd := c.Command(strings.Join(args, " ")); cmd != nil {
if ci, ok := c.(Initializer); ok {
if err := ci.Initialize(); err != nil {
- return nil, initErr{err}
+ return nil, err
}
}
return cmd, nil
}
}
- return nil, errors.New("command not found")
+ return nil, errCommandNotFound
}
// Run executes the specified command.
func (cli *Cli) Run(args ...string) error {
if len(args) > 1 {
command, err := cli.command(args[:2]...)
- switch err := err.(type) {
- case nil:
+ if err == nil {
return command(args[2:]...)
- case initErr:
- return err.error
+ }
+ if err != errCommandNotFound {
+ return err
}
}
if len(args) > 0 {
command, err := cli.command(args[0])
- switch err := err.(type) {
- case nil:
- return command(args[1:]...)
- case initErr:
- return err.error
+ if err != nil {
+ if err == errCommandNotFound {
+ cli.noSuchCommand(args[0])
+ return nil
+ }
+ return err
}
- cli.noSuchCommand(args[0])
+ return command(args[1:]...)
}
return cli.CmdHelp()
}
@@ -110,24 +106,25 @@ func (cli *Cli) Command(name string) func(...string) error {
func (cli *Cli) CmdHelp(args ...string) error {
if len(args) > 1 {
command, err := cli.command(args[:2]...)
- switch err := err.(type) {
- case nil:
+ if err == nil {
command("--help")
return nil
- case initErr:
- return err.error
+ }
+ if err != errCommandNotFound {
+ return err
}
}
if len(args) > 0 {
command, err := cli.command(args[0])
- switch err := err.(type) {
- case nil:
- command("--help")
- return nil
- case initErr:
- return err.error
+ if err != nil {
+ if err == errCommandNotFound {
+ cli.noSuchCommand(args[0])
+ return nil
+ }
+ return err
}
- cli.noSuchCommand(args[0])
+ command("--help")
+ return nil
}
if cli.Usage == nil {