Skip to content

Commit

Permalink
Bump fortio.org/terminal from 0.27.0 to 0.27.1 in the fortio group (#269
Browse files Browse the repository at this point in the history
)

* Bump fortio.org/terminal from 0.27.0 to 0.27.1 in the fortio group

Bumps the fortio group with 1 update: [fortio.org/terminal](https://github.com/fortio/terminal).


Updates `fortio.org/terminal` from 0.27.0 to 0.27.1
- [Release notes](https://github.com/fortio/terminal/releases)
- [Commits](fortio/terminal@v0.27.0...v0.27.1)

---
updated-dependencies:
- dependency-name: fortio.org/terminal
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: fortio
...

Signed-off-by: dependabot[bot] <support@github.com>

* linter changes

* go 1.23

* update linter

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Laurent Demailly <ldemailly@gmail.com>
  • Loading branch information
dependabot[bot] and ldemailly authored Nov 13, 2024
1 parent fb3819e commit 47783c2
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/gochecks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Setup Go environment
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # pin@v5
with:
go-version: '1.22'
go-version: '1.23'
check-latest: true
- name: Run Vulncheck
if: matrix.os == 'ubuntu-latest'
Expand All @@ -34,7 +34,7 @@ jobs:
if: matrix.os == 'ubuntu-latest'
uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # pin@v6
with:
version: v1.61.0
version: v1.62.0
- name: Install Git Bash
run: |
choco install git
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/releaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5 # pin@v3
with:
go-version: '1.22'
go-version: '1.23'
check-latest: true
- name: Log in to Docker
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # pin@v2
Expand Down
2 changes: 1 addition & 1 deletion eval/eval.go
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ func (s *State) evalInternal(node any) object.Object { //nolint:funlen,gocognit,
log.LogVf("Normalizing non-short lambda form to => lambda")
fn.Lambda = true
}
fn.SetCacheKey() // sets cache key
object.SetCacheKey(&fn) // sets cache key
if name != nil {
oerr := s.env.Set(name.Literal(), fn)
if oerr.Type() == object.ERROR {
Expand Down
8 changes: 4 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
module grol.io/grol

go 1.22.7
go 1.23.3

require (
fortio.org/cli v1.9.2
fortio.org/log v1.17.1
fortio.org/safecast v1.0.0
fortio.org/sets v1.2.0
fortio.org/struct2env v0.4.1
fortio.org/terminal v0.27.0
fortio.org/terminal v0.27.1
fortio.org/testscript v0.3.2 // only for tests
fortio.org/version v1.0.4
github.com/rivo/uniseg v0.4.7
golang.org/x/image v0.21.0
golang.org/x/image v0.22.0
)

require (
fortio.org/term v0.23.0-fortio-6 // indirect
github.com/kortschak/goroutine v1.1.2 // indirect
golang.org/x/crypto/x509roots/fallback v0.0.0-20240916204253-42ee18b96377 // indirect
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
golang.org/x/sys v0.26.0 // indirect
golang.org/x/sys v0.27.0 // indirect
golang.org/x/tools v0.25.0 // indirect
)
12 changes: 6 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ fortio.org/struct2env v0.4.1 h1:rJludAMO5eBvpWplWEQNqoVDFZr4RWMQX7RUapgZyc0=
fortio.org/struct2env v0.4.1/go.mod h1:lENUe70UwA1zDUCX+8AsO663QCFqYaprk5lnPhjD410=
fortio.org/term v0.23.0-fortio-6 h1:pKrUX0tKOxyEhkhLV50oJYucTVx94rzFrXc24lIuLvk=
fortio.org/term v0.23.0-fortio-6/go.mod h1:7buBfn81wEJUGWiVjFNiUE/vxWs5FdM9c7PyZpZRS30=
fortio.org/terminal v0.27.0 h1:wlenFkIdNCyI7pxr+xRpQSefy9/XcL9e3rfrnPgEloc=
fortio.org/terminal v0.27.0/go.mod h1:MikWZO8nnM+W4KjiEakpahRLqSaJvaeDdzysYGCHcP8=
fortio.org/terminal v0.27.1 h1:4TQnDltqCrYEt653dXaX/r388Jj3YxahTEPmBj9MLWs=
fortio.org/terminal v0.27.1/go.mod h1:J7wmCkbBZhCNv3HPgctMOTI8WeJmoBE5BbkFzcXw19I=
fortio.org/testscript v0.3.2 h1:ks5V+Y6H6nmeGqnVlZuLdiFwpqXemDkEnyGgCZa/ZNA=
fortio.org/testscript v0.3.2/go.mod h1:Z2kUvEDHYETV8FLxsdA6zwSZ8sZUiTNJh2Dw5c4a3Pg=
fortio.org/version v1.0.4 h1:FWUMpJ+hVTNc4RhvvOJzb0xesrlRmG/a+D6bjbQ4+5U=
Expand All @@ -26,9 +26,9 @@ golang.org/x/crypto/x509roots/fallback v0.0.0-20240916204253-42ee18b96377 h1:aDW
golang.org/x/crypto/x509roots/fallback v0.0.0-20240916204253-42ee18b96377/go.mod h1:kNa9WdvYnzFwC79zRpLRMJbdEFlhyM5RPFBBZp/wWH8=
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWBtpfqks2bwGcexMxgtk=
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY=
golang.org/x/image v0.21.0 h1:c5qV36ajHpdj4Qi0GnE0jUc/yuo33OLFaa0d+crTD5s=
golang.org/x/image v0.21.0/go.mod h1:vUbsLavqK/W303ZroQQVKQ+Af3Yl6Uz1Ppu5J/cLz78=
golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/image v0.22.0 h1:UtK5yLUzilVrkjMAZAZ34DXGpASN8i8pj8g+O+yd10g=
golang.org/x/image v0.22.0/go.mod h1:9hPFhljd4zZ1GNSIZJ49sqbp45GKK9t6w+iXvGqZUz4=
golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/tools v0.25.0 h1:oFU9pkj/iJgs+0DT+VMHrx+oBKs/LJMV+Uvg78sl+fE=
golang.org/x/tools v0.25.0/go.mod h1:/vtpO8WL1N9cQC3FN5zPqb//fRXskFHbLKk4OW1Q7rg=
8 changes: 4 additions & 4 deletions object/object.go
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@ func (f Function) Type() Type { return FUNC }
// Must be called after the function is fully initialized.
// Whether a function result should be cached doesn't depend on the Name,
// so it's not part of the cache key.
func (f *Function) SetCacheKey() string {
func SetCacheKey(f *Function) string {
out := strings.Builder{}
if !f.Lambda {
out.WriteString("func ")
Expand All @@ -616,7 +616,7 @@ func (f *Function) SetCacheKey() string {
return f.CacheKey
}

func (f *Function) lambdaPrint(ps *ast.PrintState, out *strings.Builder) string {
func (f Function) lambdaPrint(ps *ast.PrintState, out *strings.Builder) string {
if len(f.Parameters) != 1 {
out.WriteString(")=>")
} else {
Expand All @@ -636,7 +636,7 @@ func (f *Function) lambdaPrint(ps *ast.PrintState, out *strings.Builder) string
}

// Common part of Inspect and SetCacheKey. Outputs the rest of the function.
func (f *Function) finishFuncOutput(out *strings.Builder, compact bool) string {
func (f Function) finishFuncOutput(out *strings.Builder, compact bool) string {
needParen := !f.Lambda || len(f.Parameters) != 1
if needParen {
out.WriteString("(")
Expand Down Expand Up @@ -1188,7 +1188,7 @@ type ShortExtFunction func(args []Object) Object
// name is the function name as registered under.
type ExtFunction func(eval any, name string, args []Object) Object

func (e *Extension) Usage(out *strings.Builder) {
func (e Extension) Usage(out *strings.Builder) {
for i := 1; i <= e.MinArgs; i++ {
if i > 1 {
out.WriteString(", ")
Expand Down

0 comments on commit 47783c2

Please sign in to comment.