parse: provide more context for parsers

gobwas · Sep 5, 2020 · 6cb37cc · 6cb37cc
1 parent f273679
commit 6cb37cc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/parse/args/args.go b/parse/args/args.go
@@ -112,7 +112,7 @@ func (p *Parser) isBoolFlag(name string) bool {
 }
 
 func (p *Parser) fail(f string, args ...interface{}) {
-	p.err = fmt.Errorf(f, args...)
+	p.err = fmt.Errorf("args: %s", fmt.Sprintf(f, args...))
 }
 
 func split(s string, sep byte) (a, b string, ok bool) {

diff --git a/parse/file/file.go b/parse/file/file.go
@@ -24,7 +24,7 @@ type Lookup interface {
 
 // ErrNoFile is an returned by Lookup implementation to report that lookup
 // didn't find any file to parse.
-var ErrNoFile = fmt.Errorf("flagutil/file: no file")
+var ErrNoFile = fmt.Errorf("file: no file")
 
 // LookupFunc is an adapter that allows the use of ordinar functions as Lookup.
 type LookupFunc func() (io.ReadCloser, error)
@@ -95,7 +95,7 @@ func (p PathLookup) Lookup() (io.ReadCloser, error) {
 	}
 	if info.IsDir() {
 		return nil, fmt.Errorf(
-			"flagutil/file: can't parse %s since its dir",
+			"file: can't parse %s since its dir",
 			p,
 		)
 	}
@@ -128,7 +128,7 @@ func (p *Parser) Parse(_ context.Context, fs parse.FlagSet) error {
 	bts, err := p.readSource()
 	if err == ErrNoFile {
 		if p.Required {
-			err = fmt.Errorf("flagutil/file: source not found")
+			err = fmt.Errorf("file: source not found")
 		} else {
 			err = nil
 		}
@@ -141,7 +141,7 @@ func (p *Parser) Parse(_ context.Context, fs parse.FlagSet) error {
 	}
 	x, err := p.Syntax.Unmarshal(bts)
 	if err != nil {
-		return fmt.Errorf("flagutil/file: syntax error: %v", err)
+		return fmt.Errorf("file: syntax error: %v", err)
 	}
 	return parse.Setup(x, parse.VisitorFunc{
 		SetFunc: func(name, value string) error {

diff --git a/parse/pargs/posix.go b/parse/pargs/posix.go
@@ -235,7 +235,7 @@ func (p *Parser) shorthands(fs parse.FlagSet) map[string]string {
 }
 
 func (p *Parser) fail(f string, args ...interface{}) {
-	p.err = fmt.Errorf(f, args...)
+	p.err = fmt.Errorf("pargs: %s", fmt.Sprintf(f, args...))
 }
 
 func split(s string, sep byte) (a, b string, ok bool) {