diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 95019ba4a..dc932210c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -134,9 +134,9 @@ jobs: run: | go install golang.org/x/tools/cmd/stringer@latest go install golang.org/x/tools/cmd/goimports@latest - # Keep the versions of staticcheck and codespell in sync with CONTRIBUTING.md - go install honnef.co/go/tools/cmd/staticcheck@v0.4.6 - pip install --user codespell==2.2.6 + # Keep the versions of staticcheck and codespell in sync with docs/workflows.md + go install honnef.co/go/tools/cmd/staticcheck@v0.5.1 + pip install --user codespell==2.3.0 - name: Run checks run: make all-checks diff --git a/docs/workflows.md b/docs/workflows.md index 4b78f9e3d..4f3f43cb5 100644 --- a/docs/workflows.md +++ b/docs/workflows.md @@ -92,8 +92,8 @@ The checks depend on some external programs, which can be installed as follows: ```sh go install golang.org/x/tools/cmd/goimports@latest -go install honnef.co/go/tools/cmd/staticcheck@v0.4.6 -pip install --user codespell==2.2.6 +go install honnef.co/go/tools/cmd/staticcheck@v0.5.1 +pip install --user codespell==2.3.0 ``` ## Licensing diff --git a/pkg/eval/go_fn.go b/pkg/eval/go_fn.go index 068bf1d68..b4decb464 100644 --- a/pkg/eval/go_fn.go +++ b/pkg/eval/go_fn.go @@ -120,7 +120,7 @@ func NewGoFn(name string, impl any) Callable { b.rawOptions = true i++ } - if i < implType.NumIn() && reflect.PtrTo(implType.In(i)).Implements(optionsPtrType) { + if i < implType.NumIn() && reflect.PointerTo(implType.In(i)).Implements(optionsPtrType) { if b.rawOptions { panic("Function declares both RawOptions and Options parameters") } diff --git a/pkg/getopt/getopt.go b/pkg/getopt/getopt.go index de1b72594..23c48be2c 100644 --- a/pkg/getopt/getopt.go +++ b/pkg/getopt/getopt.go @@ -17,7 +17,7 @@ import ( "src.elv.sh/pkg/errutil" ) -// Config configurates the parsing behavior. +// Config configures the parsing behavior. type Config uint const ( diff --git a/pkg/rpc/server.go b/pkg/rpc/server.go index a2684d089..64d32fa3e 100644 --- a/pkg/rpc/server.go +++ b/pkg/rpc/server.go @@ -255,7 +255,7 @@ func (server *Server) register(rcvr any, name string, useName bool) error { str := "" // To help the user, see if a pointer receiver would work. - method := suitableMethods(reflect.PtrTo(s.typ), false) + method := suitableMethods(reflect.PointerTo(s.typ), false) if len(method) != 0 { str = "rpc.Register: type " + sname + " has no exported methods of suitable type (hint: pass a pointer to value of that type)" } else {