wit
/
arg
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge conflicts

This commit is contained in:
Fredrik Wallgren 2015-11-22 00:58:27 +01:00
parent b0d37d1fb2
commit 670c7b787d
No known key found for this signature in database
GPG Key ID: F47F4EC105BDC53E
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usage.go
View File

@ -5,6 +5,7 @@ import (
"io" "io"
"os" "os"
"path/filepath" "path/filepath"
"reflect"
"strings" "strings"
) )
@ -76,6 +77,7 @@ func (p *Parser) WriteHelp(w io.Writer) {
} }
} }
// write the list of options
fmt.Fprint(w, "\noptions:\n") fmt.Fprint(w, "\noptions:\n")
for _, spec := range options { for _, spec := range options {
printOption(w, spec) printOption(w, spec)
@ -103,9 +105,11 @@ func printOption(w io.Writer, spec *spec) {
// Check if spec.dest is zero value or not // Check if spec.dest is zero value or not
// If it isn't a default value have been added // If it isn't a default value have been added
v := spec.dest v := spec.dest
z := reflect.Zero(v.Type()) if v.IsValid() {
if v.Interface() != z.Interface() { z := reflect.Zero(v.Type())
fmt.Fprintf(w, " [default: %v]", v) if v.Interface() != z.Interface() {
fmt.Fprintf(w, " [default: %v]", v)
}
} }
fmt.Fprint(w, "\n") fmt.Fprint(w, "\n")
} }