From 3f5d73bf3e706b3bf7402f797107da5d0193012f Mon Sep 17 00:00:00 2001 From: bth Date: Thu, 29 Jan 2026 11:17:52 -0800 Subject: [PATCH] help : errors.As : assign to the HelpError constructed at callsite --- cat/cat.go | 5 ++--- last/last.go | 5 ++--- mv/mv.go | 5 ++--- next/next.go | 5 ++--- sort/sort.go | 5 ++--- tag/tag.go | 5 ++--- 6 files changed, 12 insertions(+), 18 deletions(-) diff --git a/cat/cat.go b/cat/cat.go index 4b8286b..189dd5f 100644 --- a/cat/cat.go +++ b/cat/cat.go @@ -85,9 +85,8 @@ func Cat(args []string) { opts := initOpts() help := flags.NewHelpError(CMD, SUMMARY) if err := flags.ParseArgs(help, args, &opts); err != nil { - var herr flags.HelpError - if errors.As(err, &herr) { - fmt.Println(herr) + if errors.As(err, &help) { + fmt.Println(help) return } log.Fatalf("um %s: %s", CMD, err) diff --git a/last/last.go b/last/last.go index 3485184..17b0890 100644 --- a/last/last.go +++ b/last/last.go @@ -48,9 +48,8 @@ func Last(args []string) { opts := initOpts() help := flags.NewHelpError(CMD, SUMMARY) if err := flags.ParseArgs(help, args, &opts); err != nil { - var herr flags.HelpError - if errors.As(err, &herr) { - fmt.Println(herr) + if errors.As(err, &help) { + fmt.Println(help) return } log.Fatalf("um %s: %s", CMD, err) diff --git a/mv/mv.go b/mv/mv.go index e91ecbf..7d27825 100644 --- a/mv/mv.go +++ b/mv/mv.go @@ -92,9 +92,8 @@ func Mv(args []string) { opts := initOpts() help := flags.NewHelpError(CMD, SUMMARY) if err := flags.ParseArgs(help, args, &opts); err != nil { - var herr flags.HelpError - if errors.As(err, &herr) { - fmt.Println(herr) + if errors.As(err, &help) { + fmt.Println(help) return } log.Fatalf("um %s: %s", CMD, err) diff --git a/next/next.go b/next/next.go index 910ee3b..c0559e9 100644 --- a/next/next.go +++ b/next/next.go @@ -102,9 +102,8 @@ func Next(args []string) { opts := initOpts() help := flags.NewHelpError(CMD, SUMMARY) if err := flags.ParseArgs(help, args, &opts); err != nil { - var herr flags.HelpError - if errors.As(err, &herr) { - fmt.Println(herr) + if errors.As(err, &help) { + fmt.Println(help) return } log.Fatalf("um %s: %s", CMD, err) diff --git a/sort/sort.go b/sort/sort.go index 8b91c82..5bdda0a 100644 --- a/sort/sort.go +++ b/sort/sort.go @@ -72,9 +72,8 @@ func Sort(args []string) { opts := initOpts() help := flags.NewHelpError(CMD, SUMMARY) if err := flags.ParseArgs(help, args, &opts); err != nil { - var herr flags.HelpError - if errors.As(err, &herr) { - fmt.Println(herr) + if errors.As(err, &help) { + fmt.Println(help) return } log.Fatalf("um %s: %s", CMD, err) diff --git a/tag/tag.go b/tag/tag.go index 10814da..5436fce 100644 --- a/tag/tag.go +++ b/tag/tag.go @@ -38,9 +38,8 @@ func Tag(args []string) { opts := initOpts() help := flags.NewHelpError(CMD, SUMMARY) if err := flags.ParseArgs(help, args, &opts); err != nil { - var herr flags.HelpError - if errors.As(err, &herr) { - fmt.Println(herr) + if errors.As(err, &help) { + fmt.Println(help) return } log.Fatalf("um %s: %s", CMD, err)