diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 2a246c5..07e8259 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -31,7 +31,7 @@ jobs: - name: Modver if: ${{ github.event_name == 'pull_request' }} - uses: bobg/modver@v2.14.0 + uses: bobg/modver@v2.14.2 with: github_token: ${{ secrets.GITHUB_TOKEN }} pull_request_url: https://github.com/${{ github.repository }}/pull/${{ github.event.number }} diff --git a/Readme.md b/Readme.md index 8888881..5705e16 100644 --- a/Readme.md +++ b/Readme.md @@ -1,7 +1,6 @@ # Decouple - find overspecified function parameters in Go code [![Go Reference](https://pkg.go.dev/badge/github.com/bobg/decouple.svg)](https://pkg.go.dev/github.com/bobg/decouple) -[![Go Report Card](https://goreportcard.com/badge/github.com/bobg/decouple)](https://goreportcard.com/report/github.com/bobg/decouple) [![Tests](https://github.com/bobg/decouple/actions/workflows/go.yml/badge.svg)](https://github.com/bobg/decouple/actions/workflows/go.yml) [![Coverage Status](https://coveralls.io/repos/github/bobg/decouple/badge.svg?branch=main)](https://coveralls.io/github/bobg/decouple?branch=main) [![Mentioned in Awesome Go](https://awesome.re/mentioned-badge.svg)](https://github.com/avelino/awesome-go) diff --git a/cmd/decouple/main.go b/cmd/decouple/main.go index 95b8e83..582f98c 100644 --- a/cmd/decouple/main.go +++ b/cmd/decouple/main.go @@ -145,7 +145,7 @@ func showJSON(w io.Writer, checker decouple.Checker, tuples []decouple.Tuple) er return jt.Params[i].Name < jt.Params[j].Name }) if err := enc.Encode(jt); err != nil { - return err + return errors.Wrap(err, "encoding JSON output") } } diff --git a/errf_test.go b/errf_test.go index bdcf186..8bdc9e8 100644 --- a/errf_test.go +++ b/errf_test.go @@ -8,8 +8,7 @@ import ( func TestErrf(t *testing.T) { got := errf("What's a %d?", 412) - var d derr - if !errors.As(got, &d) { + if _, ok := errors.AsType[derr](got); !ok { t.Errorf("got %v, want derr", got) } diff --git a/go.mod b/go.mod index 207b45f..40d715d 100644 --- a/go.mod +++ b/go.mod @@ -6,10 +6,10 @@ require ( github.com/bobg/errors v1.3.0 github.com/bobg/go-generics/v4 v4.2.0 github.com/bobg/seqs v1.8.0 - golang.org/x/tools v0.42.0 + golang.org/x/tools v0.49.0 ) require ( - golang.org/x/mod v0.33.0 // indirect - golang.org/x/sync v0.19.0 // indirect + golang.org/x/mod v0.39.0 // indirect + golang.org/x/sync v0.22.0 // indirect ) diff --git a/go.sum b/go.sum index ac31411..796de31 100644 --- a/go.sum +++ b/go.sum @@ -10,7 +10,13 @@ github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8= golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w= +golang.org/x/mod v0.39.0 h1:UF5zwQdCRRUpHfyPwr7d4UrGiVeldIsogtzWVnczL74= +golang.org/x/mod v0.39.0/go.mod h1:bvIbwjQ0HUFFf5AKukeeYQG4ZBUG9yxQbR9aEweIwYY= golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4= golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= +golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek= +golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= golang.org/x/tools v0.42.0 h1:uNgphsn75Tdz5Ji2q36v/nsFSfR/9BRFvqhGBaJGd5k= golang.org/x/tools v0.42.0/go.mod h1:Ma6lCIwGZvHK6XtgbswSoWroEkhugApmsXyrUmBhfr0= +golang.org/x/tools v0.49.0 h1:3NI7VXzL9+1WZD52Dx2ttoPwD5DWrFGpl9mFZDlmisI= +golang.org/x/tools v0.49.0/go.mod h1:SJNXV9DBKT0UbdttsQjbfJlAE/q+y36++zo3uL3N0Oo=