From a2d1586ff8d03a10f9282f98c960d56f91082eb5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Oct 2025 22:45:31 +0000 Subject: [PATCH 1/2] build(deps): bump github.com/ldez/exptostd from 0.4.4 to 0.4.5 Bumps [github.com/ldez/exptostd](https://github.com/ldez/exptostd) from 0.4.4 to 0.4.5. - [Commits](https://github.com/ldez/exptostd/compare/v0.4.4...v0.4.5) --- updated-dependencies: - dependency-name: github.com/ldez/exptostd dependency-version: 0.4.5 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a422ffe6fd91..f114823d849f 100644 --- a/go.mod +++ b/go.mod @@ -73,7 +73,7 @@ require ( github.com/kulti/thelper v0.7.1 github.com/kunwardeep/paralleltest v1.0.14 github.com/lasiar/canonicalheader v1.1.2 - github.com/ldez/exptostd v0.4.4 + github.com/ldez/exptostd v0.4.5 github.com/ldez/gomoddirectives v0.7.1 github.com/ldez/grignotin v0.10.1 github.com/ldez/tagliatelle v0.7.2 diff --git a/go.sum b/go.sum index 1ee8d324e7bd..08089d029680 100644 --- a/go.sum +++ b/go.sum @@ -384,8 +384,8 @@ github.com/kunwardeep/paralleltest v1.0.14 h1:wAkMoMeGX/kGfhQBPODT/BL8XhK23ol/nu github.com/kunwardeep/paralleltest v1.0.14/go.mod h1:di4moFqtfz3ToSKxhNjhOZL+696QtJGCFe132CbBLGk= github.com/lasiar/canonicalheader v1.1.2 h1:vZ5uqwvDbyJCnMhmFYimgMZnJMjwljN5VGY0VKbMXb4= github.com/lasiar/canonicalheader v1.1.2/go.mod h1:qJCeLFS0G/QlLQ506T+Fk/fWMa2VmBUiEI2cuMK4djI= -github.com/ldez/exptostd v0.4.4 h1:58AtQjnLcT/tI5W/1KU7xE/O7zW9RAWB6c/ScQAnfus= -github.com/ldez/exptostd v0.4.4/go.mod h1:QfdzPw6oHjFVdNV7ILoPu5sw3OZ3OG1JS0I5JN3J4Js= +github.com/ldez/exptostd v0.4.5 h1:kv2ZGUVI6VwRfp/+bcQ6Nbx0ghFWcGIKInkG/oFn1aQ= +github.com/ldez/exptostd v0.4.5/go.mod h1:QRjHRMXJrCTIm9WxVNH6VW7oN7KrGSht69bIRwvdFsM= github.com/ldez/gomoddirectives v0.7.1 h1:FaULkvUIG36hj6chpwa+FdCNGZBsD7/fO+p7CCsM6pE= github.com/ldez/gomoddirectives v0.7.1/go.mod h1:auDNtakWJR1rC+YX7ar+HmveqXATBAyEK1KYpsIRW/8= github.com/ldez/grignotin v0.10.1 h1:keYi9rYsgbvqAZGI1liek5c+jv9UUjbvdj3Tbn5fn4o= From 0a5c496202c9a50ed408776900abbce367c85ade Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Thu, 9 Oct 2025 00:57:31 +0200 Subject: [PATCH 2/2] chore: update tests --- pkg/golinters/exptostd/testdata/exptostd.go | 8 +- .../exptostd/testdata/exptostd_cgo.go | 8 +- .../exptostd/testdata/exptostd_go123.go | 91 --------------- .../exptostd/testdata/exptostd_go123_cgo.go | 108 ------------------ .../exptostd/testdata/fix/in/exptostd.go | 4 +- .../exptostd/testdata/fix/out/exptostd.go | 4 +- 6 files changed, 16 insertions(+), 207 deletions(-) delete mode 100644 pkg/golinters/exptostd/testdata/exptostd_go123.go delete mode 100644 pkg/golinters/exptostd/testdata/exptostd_go123_cgo.go diff --git a/pkg/golinters/exptostd/testdata/exptostd.go b/pkg/golinters/exptostd/testdata/exptostd.go index 527da55211c0..47ee66d756c8 100644 --- a/pkg/golinters/exptostd/testdata/exptostd.go +++ b/pkg/golinters/exptostd/testdata/exptostd.go @@ -4,13 +4,17 @@ package testdata import ( "fmt" - "golang.org/x/exp/maps" // want `Import statement 'golang.org/x/exp/maps' can be replaced by 'maps'` - "golang.org/x/exp/slices" // want `Import statement 'golang.org/x/exp/slices' can be replaced by 'slices'` + "golang.org/x/exp/maps" // want `Import statement 'golang.org/x/exp/maps' may be replaced by 'maps'` + "golang.org/x/exp/slices" // want `Import statement 'golang.org/x/exp/slices' may be replaced by 'slices'` ) func _(m, a map[string]string) { maps.Clone(m) // want `golang.org/x/exp/maps.Clone\(\) can be replaced by maps.Clone\(\)` + maps.Keys(m) // want `golang.org/x/exp/maps\.Keys\(\) can be replaced by slices\.AppendSeq\(make\(\[\]T, 0, len\(data\)\), maps\.Keys\(data\)\)` + + maps.Values(m) // want `golang.org/x/exp/maps\.Values\(\) can be replaced by slices\.AppendSeq\(make\(\[\]T, 0, len\(data\)\), maps\.Values\(data\)\)` + maps.Equal(m, a) // want `golang.org/x/exp/maps.Equal\(\) can be replaced by maps.Equal\(\)` maps.EqualFunc(m, a, func(i, j string) bool { // want `golang.org/x/exp/maps.EqualFunc\(\) can be replaced by maps.EqualFunc\(\)` diff --git a/pkg/golinters/exptostd/testdata/exptostd_cgo.go b/pkg/golinters/exptostd/testdata/exptostd_cgo.go index f036865f2ba4..8db5a52d7c5b 100644 --- a/pkg/golinters/exptostd/testdata/exptostd_cgo.go +++ b/pkg/golinters/exptostd/testdata/exptostd_cgo.go @@ -15,8 +15,8 @@ import ( "fmt" "unsafe" - "golang.org/x/exp/maps" // want `Import statement 'golang.org/x/exp/maps' can be replaced by 'maps'` - "golang.org/x/exp/slices" // want `Import statement 'golang.org/x/exp/slices' can be replaced by 'slices'` + "golang.org/x/exp/maps" // want `Import statement 'golang.org/x/exp/maps' may be replaced by 'maps'` + "golang.org/x/exp/slices" // want `Import statement 'golang.org/x/exp/slices' may be replaced by 'slices'` ) func _() { @@ -28,6 +28,10 @@ func _() { func _(m, a map[string]string) { maps.Clone(m) // want `golang.org/x/exp/maps.Clone\(\) can be replaced by maps.Clone\(\)` + maps.Keys(m) // want `golang.org/x/exp/maps\.Keys\(\) can be replaced by slices\.AppendSeq\(make\(\[\]T, 0, len\(data\)\), maps\.Keys\(data\)\)` + + maps.Values(m) // want `golang.org/x/exp/maps\.Values\(\) can be replaced by slices\.AppendSeq\(make\(\[\]T, 0, len\(data\)\), maps\.Values\(data\)\)` + maps.Equal(m, a) // want `golang.org/x/exp/maps.Equal\(\) can be replaced by maps.Equal\(\)` maps.EqualFunc(m, a, func(i, j string) bool { // want `golang.org/x/exp/maps.EqualFunc\(\) can be replaced by maps.EqualFunc\(\)` diff --git a/pkg/golinters/exptostd/testdata/exptostd_go123.go b/pkg/golinters/exptostd/testdata/exptostd_go123.go deleted file mode 100644 index 90305ea265e1..000000000000 --- a/pkg/golinters/exptostd/testdata/exptostd_go123.go +++ /dev/null @@ -1,91 +0,0 @@ -//go:build go1.23 - -//golangcitest:args -Eexptostd -package testdata - -import ( - "fmt" - - "golang.org/x/exp/maps" // want `Import statement 'golang.org/x/exp/maps' can be replaced by 'maps'` - "golang.org/x/exp/slices" // want `Import statement 'golang.org/x/exp/slices' can be replaced by 'slices'` -) - -func _(m, a map[string]string) { - maps.Clone(m) // want `golang.org/x/exp/maps.Clone\(\) can be replaced by maps.Clone\(\)` - - maps.Keys(m) // want `golang.org/x/exp/maps\.Keys\(\) can be replaced by slices\.AppendSeq\(make\(\[\]T, 0, len\(data\)\), maps\.Keys\(data\)\)` - - maps.Values(m) // want `golang.org/x/exp/maps\.Values\(\) can be replaced by slices\.AppendSeq\(make\(\[\]T, 0, len\(data\)\), maps\.Values\(data\)\)` - - maps.Equal(m, a) // want `golang.org/x/exp/maps.Equal\(\) can be replaced by maps.Equal\(\)` - - maps.EqualFunc(m, a, func(i, j string) bool { // want `golang.org/x/exp/maps.EqualFunc\(\) can be replaced by maps.EqualFunc\(\)` - return true - }) - - maps.Copy(m, a) // want `golang.org/x/exp/maps.Copy\(\) can be replaced by maps.Copy\(\)` - - maps.DeleteFunc(m, func(_, _ string) bool { // want `golang.org/x/exp/maps.DeleteFunc\(\) can be replaced by maps.DeleteFunc\(\)` - return true - }) - - maps.Clear(m) // want `golang.org/x/exp/maps.Clear\(\) can be replaced by clear\(\)` - - fmt.Println("Hello") -} - -func _(a, b []string) { - slices.Equal(a, b) - slices.EqualFunc(a, b, func(_ string, _ string) bool { - return true - }) - slices.Compare(a, b) - slices.CompareFunc(a, b, func(_ string, _ string) int { - return 0 - }) - slices.Index(a, "a") - slices.IndexFunc(a, func(_ string) bool { - return true - }) - slices.Contains(a, "a") - slices.ContainsFunc(a, func(_ string) bool { - return true - }) - slices.Insert(a, 0, "a", "b") - slices.Delete(a, 0, 1) - slices.DeleteFunc(a, func(_ string) bool { - return true - }) - slices.Replace(a, 0, 1, "a") - slices.Clone(a) - slices.Compact(a) - slices.CompactFunc(a, func(_ string, _ string) bool { - return true - }) - slices.Grow(a, 2) - slices.Clip(a) - slices.Reverse(a) - slices.Sort(a) - slices.SortFunc(a, func(_, _ string) int { - return 0 - }) - slices.SortStableFunc(a, func(_, _ string) int { - return 0 - }) - slices.IsSorted(a) - slices.IsSortedFunc(a, func(_, _ string) int { - return 0 - }) - slices.Min(a) - slices.MinFunc(a, func(_, _ string) int { - return 0 - }) - slices.Max(a) - slices.MaxFunc(a, func(_, _ string) int { - return 0 - }) - slices.BinarySearch(a, "a") - slices.BinarySearchFunc(a, b, func(_ string, _ []string) int { - return 0 - }) -} diff --git a/pkg/golinters/exptostd/testdata/exptostd_go123_cgo.go b/pkg/golinters/exptostd/testdata/exptostd_go123_cgo.go deleted file mode 100644 index 7f8cedcef6df..000000000000 --- a/pkg/golinters/exptostd/testdata/exptostd_go123_cgo.go +++ /dev/null @@ -1,108 +0,0 @@ -//go:build go1.23 - -//golangcitest:args -Eexptostd -package testdata - -/* - #include - #include - - void myprint(char* s) { - printf("%d\n", s); - } -*/ -import "C" - -import ( - "fmt" - "unsafe" - - "golang.org/x/exp/maps" // want `Import statement 'golang.org/x/exp/maps' can be replaced by 'maps'` - "golang.org/x/exp/slices" // want `Import statement 'golang.org/x/exp/slices' can be replaced by 'slices'` -) - -func _() { - cs := C.CString("Hello from stdio\n") - C.myprint(cs) - C.free(unsafe.Pointer(cs)) -} - -func _(m, a map[string]string) { - maps.Clone(m) // want `golang.org/x/exp/maps.Clone\(\) can be replaced by maps.Clone\(\)` - - maps.Keys(m) // want `golang.org/x/exp/maps\.Keys\(\) can be replaced by slices\.AppendSeq\(make\(\[\]T, 0, len\(data\)\), maps\.Keys\(data\)\)` - - maps.Values(m) // want `golang.org/x/exp/maps\.Values\(\) can be replaced by slices\.AppendSeq\(make\(\[\]T, 0, len\(data\)\), maps\.Values\(data\)\)` - - maps.Equal(m, a) // want `golang.org/x/exp/maps.Equal\(\) can be replaced by maps.Equal\(\)` - - maps.EqualFunc(m, a, func(i, j string) bool { // want `golang.org/x/exp/maps.EqualFunc\(\) can be replaced by maps.EqualFunc\(\)` - return true - }) - - maps.Copy(m, a) // want `golang.org/x/exp/maps.Copy\(\) can be replaced by maps.Copy\(\)` - - maps.DeleteFunc(m, func(_, _ string) bool { // want `golang.org/x/exp/maps.DeleteFunc\(\) can be replaced by maps.DeleteFunc\(\)` - return true - }) - - maps.Clear(m) // want `golang.org/x/exp/maps.Clear\(\) can be replaced by clear\(\)` - - fmt.Println("Hello") -} - -func _(a, b []string) { - slices.Equal(a, b) - slices.EqualFunc(a, b, func(_ string, _ string) bool { - return true - }) - slices.Compare(a, b) - slices.CompareFunc(a, b, func(_ string, _ string) int { - return 0 - }) - slices.Index(a, "a") - slices.IndexFunc(a, func(_ string) bool { - return true - }) - slices.Contains(a, "a") - slices.ContainsFunc(a, func(_ string) bool { - return true - }) - slices.Insert(a, 0, "a", "b") - slices.Delete(a, 0, 1) - slices.DeleteFunc(a, func(_ string) bool { - return true - }) - slices.Replace(a, 0, 1, "a") - slices.Clone(a) - slices.Compact(a) - slices.CompactFunc(a, func(_ string, _ string) bool { - return true - }) - slices.Grow(a, 2) - slices.Clip(a) - slices.Reverse(a) - slices.Sort(a) - slices.SortFunc(a, func(_, _ string) int { - return 0 - }) - slices.SortStableFunc(a, func(_, _ string) int { - return 0 - }) - slices.IsSorted(a) - slices.IsSortedFunc(a, func(_, _ string) int { - return 0 - }) - slices.Min(a) - slices.MinFunc(a, func(_, _ string) int { - return 0 - }) - slices.Max(a) - slices.MaxFunc(a, func(_, _ string) int { - return 0 - }) - slices.BinarySearch(a, "a") - slices.BinarySearchFunc(a, b, func(_ string, _ []string) int { - return 0 - }) -} diff --git a/pkg/golinters/exptostd/testdata/fix/in/exptostd.go b/pkg/golinters/exptostd/testdata/fix/in/exptostd.go index d9642737dd58..9a1178703f25 100644 --- a/pkg/golinters/exptostd/testdata/fix/in/exptostd.go +++ b/pkg/golinters/exptostd/testdata/fix/in/exptostd.go @@ -4,8 +4,8 @@ package testdata import ( "fmt" - "golang.org/x/exp/maps" // want `Import statement 'golang.org/x/exp/maps' can be replaced by 'maps'` - "golang.org/x/exp/slices" // want `Import statement 'golang.org/x/exp/slices' can be replaced by 'slices'` + "golang.org/x/exp/maps" // want `Import statement 'golang.org/x/exp/maps' may be replaced by 'maps'` + "golang.org/x/exp/slices" // want `Import statement 'golang.org/x/exp/slices' may be replaced by 'slices'` ) func _(m, a map[string]string) { diff --git a/pkg/golinters/exptostd/testdata/fix/out/exptostd.go b/pkg/golinters/exptostd/testdata/fix/out/exptostd.go index 5ebf6d5900f8..f6303032080c 100644 --- a/pkg/golinters/exptostd/testdata/fix/out/exptostd.go +++ b/pkg/golinters/exptostd/testdata/fix/out/exptostd.go @@ -4,8 +4,8 @@ package testdata import ( "fmt" - "maps" // want `Import statement 'golang.org/x/exp/maps' can be replaced by 'maps'` - "slices" // want `Import statement 'golang.org/x/exp/slices' can be replaced by 'slices'` + "maps" // want `Import statement 'golang.org/x/exp/maps' may be replaced by 'maps'` + "slices" // want `Import statement 'golang.org/x/exp/slices' may be replaced by 'slices'` ) func _(m, a map[string]string) {