Remove (unused) cmdErrorBuf
Nothing was using it any more...
This commit is contained in:
parent
d0bb3e33e6
commit
0a1a8e2e92
13
command.go
13
command.go
@ -84,7 +84,6 @@ type Command struct {
|
|||||||
commandsMaxNameLen int
|
commandsMaxNameLen int
|
||||||
|
|
||||||
flagErrorBuf *bytes.Buffer
|
flagErrorBuf *bytes.Buffer
|
||||||
cmdErrorBuf *bytes.Buffer
|
|
||||||
|
|
||||||
args []string // actual args parsed from flags
|
args []string // actual args parsed from flags
|
||||||
output *io.Writer // nil means stderr; use Out() method instead
|
output *io.Writer // nil means stderr; use Out() method instead
|
||||||
@ -458,17 +457,7 @@ func (c *Command) execute(a []string) (err error) {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
// We're writing subcommand usage to root command's error buffer to have it displayed to the user
|
|
||||||
r := c.Root()
|
|
||||||
if r.cmdErrorBuf == nil {
|
|
||||||
r.cmdErrorBuf = new(bytes.Buffer)
|
|
||||||
}
|
|
||||||
// for writing the usage to the buffer we need to switch the output temporarily
|
|
||||||
// since Out() returns root output, you also need to revert that on root
|
|
||||||
out := r.Out()
|
|
||||||
r.SetOutput(r.cmdErrorBuf)
|
|
||||||
c.Usage()
|
c.Usage()
|
||||||
r.SetOutput(out)
|
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
// If help is called, regardless of other flags, we print that.
|
// If help is called, regardless of other flags, we print that.
|
||||||
@ -595,8 +584,6 @@ func (c *Command) initHelp() {
|
|||||||
func (c *Command) ResetCommands() {
|
func (c *Command) ResetCommands() {
|
||||||
c.commands = nil
|
c.commands = nil
|
||||||
c.helpCommand = nil
|
c.helpCommand = nil
|
||||||
c.cmdErrorBuf = new(bytes.Buffer)
|
|
||||||
c.cmdErrorBuf.Reset()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//Commands returns a slice of child commands.
|
//Commands returns a slice of child commands.
|
||||||
|
Loading…
Reference in New Issue
Block a user