From 050c32d894a071c372fbd1105f4f7fe58cdb9a72 Mon Sep 17 00:00:00 2001 From: Zhizhen He Date: Thu, 23 Feb 2023 16:01:00 +0800 Subject: [PATCH] de-capitalize errors to make staticcheck happy --- cmd_get.go | 2 +- cmd_get_test.go | 2 +- commands.go | 2 +- getter.go | 2 +- helpers_test.go | 6 ++++-- remote_repository_test.go | 2 +- url.go | 2 +- vcs.go | 4 ++-- 8 files changed, 12 insertions(+), 10 deletions(-) diff --git a/cmd_get.go b/cmd_get.go index b4f952d..da1bab6 100644 --- a/cmd_get.go +++ b/cmd_get.go @@ -153,7 +153,7 @@ func look(name string) error { switch len(reposFound) { case 0: - return fmt.Errorf("No repository found") + return fmt.Errorf("no repository found") case 1: repo := reposFound[0] cmd := exec.Command(detectShell()) diff --git a/cmd_get_test.go b/cmd_get_test.go index ed4a71c..222752d 100644 --- a/cmd_get_test.go +++ b/cmd_get_test.go @@ -264,7 +264,7 @@ func TestLook(t *testing.T) { } err = look("github.com/motemen/_unknown") - expect := "No repository found" + expect := "no repository found" if !strings.HasPrefix(fmt.Sprintf("%s", err), expect) { t.Errorf("error should has prefix %q, but: %s", expect, err) } diff --git a/commands.go b/commands.go index 6a62ec5..aae1c2f 100644 --- a/commands.go +++ b/commands.go @@ -90,7 +90,7 @@ var commandDocs = map[string]commandDoc{ // Makes template conditionals to generate per-command documents. func mkCommandsTemplate(genTemplate func(commandDoc) string) string { template := "{{if false}}" - for _, command := range append(commands) { + for _, command := range commands { template = template + fmt.Sprintf("{{else if (eq .Name %q)}}%s", command.Name, genTemplate(commandDocs[command.Name])) } return template + "{{end}}" diff --git a/getter.go b/getter.go index d816b5f..af64ea9 100644 --- a/getter.go +++ b/getter.go @@ -27,7 +27,7 @@ type getter struct { func (g *getter) get(argURL string) error { u, err := newURL(argURL, g.ssh, false) if err != nil { - return fmt.Errorf("Could not parse URL %q: %w", argURL, err) + return fmt.Errorf("could not parse URL %q: %w", argURL, err) } branch := g.branch if pos := strings.LastIndexByte(u.Path, '@'); pos >= 0 { diff --git a/helpers_test.go b/helpers_test.go index d572793..c2ede90 100644 --- a/helpers_test.go +++ b/helpers_test.go @@ -21,13 +21,12 @@ func captureReader(block func()) (*os.File, *os.File, error) { if err != nil { return nil, nil, err } + defer wOut.Close() rErr, wErr, err := os.Pipe() if err != nil { return nil, nil, err } - - defer wOut.Close() defer wErr.Close() var stdout, stderr *os.File @@ -74,9 +73,12 @@ func captureWithInput(in []string, block func()) (string, string, error) { return "", "", err } defer rIn.Close() + var stdin *os.File os.Stdin, stdin = rIn, os.Stdin + defer func() { os.Stdin = stdin }() + for _, line := range in { fmt.Fprintln(wIn, line) } diff --git a/remote_repository_test.go b/remote_repository_test.go index c1a1d88..3eb5972 100644 --- a/remote_repository_test.go +++ b/remote_repository_test.go @@ -50,7 +50,7 @@ func TestNewRemoteRepository(t *testing.T) { if repo.IsValid() != tc.valid { t.Errorf("repo.IsValid() should be %v, but %v", tc.valid, repo.IsValid()) } - vcs, u, err := repo.VCS() + vcs, u, _ := repo.VCS() if vcs != tc.vcsBackend { t.Errorf("got: %+v, expect: %+v", vcs, tc.vcsBackend) } diff --git a/url.go b/url.go index 6dfa772..0eef388 100644 --- a/url.go +++ b/url.go @@ -148,7 +148,7 @@ func newURL(ref string, ssh, forceMe bool) (*url.URL, error) { if ssh { // Assume Git repository if `-p` is given. if u, err = convertGitURLHTTPToSSH(u); err != nil { - return nil, fmt.Errorf("Could not convert URL %q: %w", u, err) + return nil, fmt.Errorf("could not convert URL %q: %w", u, err) } } diff --git a/vcs.go b/vcs.go index 7d3c88f..3eb5113 100644 --- a/vcs.go +++ b/vcs.go @@ -271,7 +271,7 @@ var MercurialBackend = &VCSBackend{ var DarcsBackend = &VCSBackend{ Clone: func(vg *vcsGetOption) error { if vg.branch != "" { - return errors.New("Darcs does not support branch") + return errors.New("darcs does not support branch") } dir, _ := filepath.Split(vg.dir) @@ -313,7 +313,7 @@ const fossilRepoName = ".fossil" // same as Go var FossilBackend = &VCSBackend{ Clone: func(vg *vcsGetOption) error { if vg.branch != "" { - return errors.New("Fossil does not support cloning specific branch") + return errors.New("fossil does not support cloning specific branch") } if err := os.MkdirAll(vg.dir, 0755); err != nil { return err