Skip to content

Commit ed82a69

Browse files
ldezldez
committed
feat: improves slices reports
1 parent d56c50d commit ed82a69

File tree

8 files changed

+177
-177
lines changed

8 files changed

+177
-177
lines changed

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ require (
6565
github.com/kunwardeep/paralleltest v1.0.10
6666
github.com/kyoh86/exportloopref v0.1.11
6767
github.com/lasiar/canonicalheader v1.1.2
68-
github.com/ldez/exptostd v0.2.0
68+
github.com/ldez/exptostd v0.3.0
6969
github.com/ldez/gomoddirectives v0.6.0
7070
github.com/ldez/grignotin v0.7.0
7171
github.com/ldez/tagliatelle v0.7.1

‎go.sum

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/golinters/exptostd/testdata/exptostd.go

+29-29
Original file line numberDiff line numberDiff line change
@@ -29,57 +29,57 @@ func _(m, a map[string]string) {
2929
}
3030

3131
func _(a, b []string) {
32-
slices.Equal(a, b) // want `golang.org/x/exp/slices\.Equal\(\) can be replaced by slices\.Equal\(\)`
33-
slices.EqualFunc(a, b, func(_ string, _ string) bool { // want `golang.org/x/exp/slices\.EqualFunc\(\) can be replaced by slices\.EqualFunc\(\)`
32+
slices.Equal(a, b)
33+
slices.EqualFunc(a, b, func(_ string, _ string) bool {
3434
return true
3535
})
36-
slices.Compare(a, b) // want `golang.org/x/exp/slices\.Compare\(\) can be replaced by slices\.Compare\(\)`
37-
slices.CompareFunc(a, b, func(_ string, _ string) int { // want `golang.org/x/exp/slices\.CompareFunc\(\) can be replaced by slices\.CompareFunc\(\)`
36+
slices.Compare(a, b)
37+
slices.CompareFunc(a, b, func(_ string, _ string) int {
3838
return 0
3939
})
40-
slices.Index(a, "a") // want `golang.org/x/exp/slices\.Index\(\) can be replaced by slices\.Index\(\)`
41-
slices.IndexFunc(a, func(_ string) bool { // want `golang.org/x/exp/slices\.IndexFunc\(\) can be replaced by slices\.IndexFunc\(\)`
40+
slices.Index(a, "a")
41+
slices.IndexFunc(a, func(_ string) bool {
4242
return true
4343
})
44-
slices.Contains(a, "a") // want `golang.org/x/exp/slices\.Contains\(\) can be replaced by slices\.Contains\(\)`
45-
slices.ContainsFunc(a, func(_ string) bool { // want `golang.org/x/exp/slices\.ContainsFunc\(\) can be replaced by slices\.ContainsFunc\(\)`
44+
slices.Contains(a, "a")
45+
slices.ContainsFunc(a, func(_ string) bool {
4646
return true
4747
})
48-
slices.Insert(a, 0, "a", "b") // want `golang.org/x/exp/slices\.Insert\(\) can be replaced by slices\.Insert\(\)`
49-
slices.Delete(a, 0, 1) // want `golang.org/x/exp/slices\.Delete\(\) can be replaced by slices\.Delete\(\)`
50-
slices.DeleteFunc(a, func(_ string) bool { // want `golang.org/x/exp/slices\.DeleteFunc\(\) can be replaced by slices\.DeleteFunc\(\)`
48+
slices.Insert(a, 0, "a", "b")
49+
slices.Delete(a, 0, 1)
50+
slices.DeleteFunc(a, func(_ string) bool {
5151
return true
5252
})
53-
slices.Replace(a, 0, 1, "a") // want `golang.org/x/exp/slices\.Replace\(\) can be replaced by slices\.Replace\(\)`
54-
slices.Clone(a) // want `golang.org/x/exp/slices\.Clone\(\) can be replaced by slices\.Clone\(\)`
55-
slices.Compact(a) // want `golang.org/x/exp/slices\.Compact\(\) can be replaced by slices\.Compact\(\)`
56-
slices.CompactFunc(a, func(_ string, _ string) bool { // want `golang.org/x/exp/slices\.CompactFunc\(\) can be replaced by slices\.CompactFunc\(\)`
53+
slices.Replace(a, 0, 1, "a")
54+
slices.Clone(a)
55+
slices.Compact(a)
56+
slices.CompactFunc(a, func(_ string, _ string) bool {
5757
return true
5858
})
59-
slices.Grow(a, 2) // want `golang.org/x/exp/slices\.Grow\(\) can be replaced by slices\.Grow\(\)`
60-
slices.Clip(a) // want `golang.org/x/exp/slices\.Clip\(\) can be replaced by slices\.Clip\(\)`
61-
slices.Reverse(a) // want `golang.org/x/exp/slices\.Reverse\(\) can be replaced by slices\.Reverse\(\)`
62-
slices.Sort(a) // want `golang.org/x/exp/slices\.Sort\(\) can be replaced by slices\.Sort\(\)`
63-
slices.SortFunc(a, func(_, _ string) int { // want `golang.org/x/exp/slices\.SortFunc\(\) can be replaced by slices\.SortFunc\(\)`
59+
slices.Grow(a, 2)
60+
slices.Clip(a)
61+
slices.Reverse(a)
62+
slices.Sort(a)
63+
slices.SortFunc(a, func(_, _ string) int {
6464
return 0
6565
})
66-
slices.SortStableFunc(a, func(_, _ string) int { // want `golang.org/x/exp/slices\.SortStableFunc\(\) can be replaced by slices\.SortStableFunc\(\)`
66+
slices.SortStableFunc(a, func(_, _ string) int {
6767
return 0
6868
})
69-
slices.IsSorted(a) // want `golang.org/x/exp/slices\.IsSorted\(\) can be replaced by slices\.IsSorted\(\)`
70-
slices.IsSortedFunc(a, func(_, _ string) int { // want `golang.org/x/exp/slices\.IsSortedFunc\(\) can be replaced by slices\.IsSortedFunc\(\)`
69+
slices.IsSorted(a)
70+
slices.IsSortedFunc(a, func(_, _ string) int {
7171
return 0
7272
})
73-
slices.Min(a) // want `golang.org/x/exp/slices\.Min\(\) can be replaced by slices\.Min\(\)`
74-
slices.MinFunc(a, func(_, _ string) int { // want `golang.org/x/exp/slices\.MinFunc\(\) can be replaced by slices\.MinFunc\(\)`
73+
slices.Min(a)
74+
slices.MinFunc(a, func(_, _ string) int {
7575
return 0
7676
})
77-
slices.Max(a) // want `golang.org/x/exp/slices\.Max\(\) can be replaced by slices\.Max\(\)`
78-
slices.MaxFunc(a, func(_, _ string) int { // want `golang.org/x/exp/slices\.MaxFunc\(\) can be replaced by slices\.MaxFunc\(\)`
77+
slices.Max(a)
78+
slices.MaxFunc(a, func(_, _ string) int {
7979
return 0
8080
})
81-
slices.BinarySearch(a, "a") // want `golang.org/x/exp/slices\.BinarySearch\(\) can be replaced by slices\.BinarySearch\(\)`
82-
slices.BinarySearchFunc(a, b, func(_ string, _ []string) int { // want `golang.org/x/exp/slices\.BinarySearchFunc\(\) can be replaced by slices\.BinarySearchFunc\(\)`
81+
slices.BinarySearch(a, "a")
82+
slices.BinarySearchFunc(a, b, func(_ string, _ []string) int {
8383
return 0
8484
})
8585
}

‎pkg/golinters/exptostd/testdata/exptostd_cgo.go

+29-29
Original file line numberDiff line numberDiff line change
@@ -46,57 +46,57 @@ func _(m, a map[string]string) {
4646
}
4747

4848
func _(a, b []string) {
49-
slices.Equal(a, b) // want `golang.org/x/exp/slices\.Equal\(\) can be replaced by slices\.Equal\(\)`
50-
slices.EqualFunc(a, b, func(_ string, _ string) bool { // want `golang.org/x/exp/slices\.EqualFunc\(\) can be replaced by slices\.EqualFunc\(\)`
49+
slices.Equal(a, b)
50+
slices.EqualFunc(a, b, func(_ string, _ string) bool {
5151
return true
5252
})
53-
slices.Compare(a, b) // want `golang.org/x/exp/slices\.Compare\(\) can be replaced by slices\.Compare\(\)`
54-
slices.CompareFunc(a, b, func(_ string, _ string) int { // want `golang.org/x/exp/slices\.CompareFunc\(\) can be replaced by slices\.CompareFunc\(\)`
53+
slices.Compare(a, b)
54+
slices.CompareFunc(a, b, func(_ string, _ string) int {
5555
return 0
5656
})
57-
slices.Index(a, "a") // want `golang.org/x/exp/slices\.Index\(\) can be replaced by slices\.Index\(\)`
58-
slices.IndexFunc(a, func(_ string) bool { // want `golang.org/x/exp/slices\.IndexFunc\(\) can be replaced by slices\.IndexFunc\(\)`
57+
slices.Index(a, "a")
58+
slices.IndexFunc(a, func(_ string) bool {
5959
return true
6060
})
61-
slices.Contains(a, "a") // want `golang.org/x/exp/slices\.Contains\(\) can be replaced by slices\.Contains\(\)`
62-
slices.ContainsFunc(a, func(_ string) bool { // want `golang.org/x/exp/slices\.ContainsFunc\(\) can be replaced by slices\.ContainsFunc\(\)`
61+
slices.Contains(a, "a")
62+
slices.ContainsFunc(a, func(_ string) bool {
6363
return true
6464
})
65-
slices.Insert(a, 0, "a", "b") // want `golang.org/x/exp/slices\.Insert\(\) can be replaced by slices\.Insert\(\)`
66-
slices.Delete(a, 0, 1) // want `golang.org/x/exp/slices\.Delete\(\) can be replaced by slices\.Delete\(\)`
67-
slices.DeleteFunc(a, func(_ string) bool { // want `golang.org/x/exp/slices\.DeleteFunc\(\) can be replaced by slices\.DeleteFunc\(\)`
65+
slices.Insert(a, 0, "a", "b")
66+
slices.Delete(a, 0, 1)
67+
slices.DeleteFunc(a, func(_ string) bool {
6868
return true
6969
})
70-
slices.Replace(a, 0, 1, "a") // want `golang.org/x/exp/slices\.Replace\(\) can be replaced by slices\.Replace\(\)`
71-
slices.Clone(a) // want `golang.org/x/exp/slices\.Clone\(\) can be replaced by slices\.Clone\(\)`
72-
slices.Compact(a) // want `golang.org/x/exp/slices\.Compact\(\) can be replaced by slices\.Compact\(\)`
73-
slices.CompactFunc(a, func(_ string, _ string) bool { // want `golang.org/x/exp/slices\.CompactFunc\(\) can be replaced by slices\.CompactFunc\(\)`
70+
slices.Replace(a, 0, 1, "a")
71+
slices.Clone(a)
72+
slices.Compact(a)
73+
slices.CompactFunc(a, func(_ string, _ string) bool {
7474
return true
7575
})
76-
slices.Grow(a, 2) // want `golang.org/x/exp/slices\.Grow\(\) can be replaced by slices\.Grow\(\)`
77-
slices.Clip(a) // want `golang.org/x/exp/slices\.Clip\(\) can be replaced by slices\.Clip\(\)`
78-
slices.Reverse(a) // want `golang.org/x/exp/slices\.Reverse\(\) can be replaced by slices\.Reverse\(\)`
79-
slices.Sort(a) // want `golang.org/x/exp/slices\.Sort\(\) can be replaced by slices\.Sort\(\)`
80-
slices.SortFunc(a, func(_, _ string) int { // want `golang.org/x/exp/slices\.SortFunc\(\) can be replaced by slices\.SortFunc\(\)`
76+
slices.Grow(a, 2)
77+
slices.Clip(a)
78+
slices.Reverse(a)
79+
slices.Sort(a)
80+
slices.SortFunc(a, func(_, _ string) int {
8181
return 0
8282
})
83-
slices.SortStableFunc(a, func(_, _ string) int { // want `golang.org/x/exp/slices\.SortStableFunc\(\) can be replaced by slices\.SortStableFunc\(\)`
83+
slices.SortStableFunc(a, func(_, _ string) int {
8484
return 0
8585
})
86-
slices.IsSorted(a) // want `golang.org/x/exp/slices\.IsSorted\(\) can be replaced by slices\.IsSorted\(\)`
87-
slices.IsSortedFunc(a, func(_, _ string) int { // want `golang.org/x/exp/slices\.IsSortedFunc\(\) can be replaced by slices\.IsSortedFunc\(\)`
86+
slices.IsSorted(a)
87+
slices.IsSortedFunc(a, func(_, _ string) int {
8888
return 0
8989
})
90-
slices.Min(a) // want `golang.org/x/exp/slices\.Min\(\) can be replaced by slices\.Min\(\)`
91-
slices.MinFunc(a, func(_, _ string) int { // want `golang.org/x/exp/slices\.MinFunc\(\) can be replaced by slices\.MinFunc\(\)`
90+
slices.Min(a)
91+
slices.MinFunc(a, func(_, _ string) int {
9292
return 0
9393
})
94-
slices.Max(a) // want `golang.org/x/exp/slices\.Max\(\) can be replaced by slices\.Max\(\)`
95-
slices.MaxFunc(a, func(_, _ string) int { // want `golang.org/x/exp/slices\.MaxFunc\(\) can be replaced by slices\.MaxFunc\(\)`
94+
slices.Max(a)
95+
slices.MaxFunc(a, func(_, _ string) int {
9696
return 0
9797
})
98-
slices.BinarySearch(a, "a") // want `golang.org/x/exp/slices\.BinarySearch\(\) can be replaced by slices\.BinarySearch\(\)`
99-
slices.BinarySearchFunc(a, b, func(_ string, _ []string) int { // want `golang.org/x/exp/slices\.BinarySearchFunc\(\) can be replaced by slices\.BinarySearchFunc\(\)`
98+
slices.BinarySearch(a, "a")
99+
slices.BinarySearchFunc(a, b, func(_ string, _ []string) int {
100100
return 0
101101
})
102102
}

‎pkg/golinters/exptostd/testdata/exptostd_go123.go

+29-29
Original file line numberDiff line numberDiff line change
@@ -35,57 +35,57 @@ func _(m, a map[string]string) {
3535
}
3636

3737
func _(a, b []string) {
38-
slices.Equal(a, b) // want `golang.org/x/exp/slices\.Equal\(\) can be replaced by slices\.Equal\(\)`
39-
slices.EqualFunc(a, b, func(_ string, _ string) bool { // want `golang.org/x/exp/slices\.EqualFunc\(\) can be replaced by slices\.EqualFunc\(\)`
38+
slices.Equal(a, b)
39+
slices.EqualFunc(a, b, func(_ string, _ string) bool {
4040
return true
4141
})
42-
slices.Compare(a, b) // want `golang.org/x/exp/slices\.Compare\(\) can be replaced by slices\.Compare\(\)`
43-
slices.CompareFunc(a, b, func(_ string, _ string) int { // want `golang.org/x/exp/slices\.CompareFunc\(\) can be replaced by slices\.CompareFunc\(\)`
42+
slices.Compare(a, b)
43+
slices.CompareFunc(a, b, func(_ string, _ string) int {
4444
return 0
4545
})
46-
slices.Index(a, "a") // want `golang.org/x/exp/slices\.Index\(\) can be replaced by slices\.Index\(\)`
47-
slices.IndexFunc(a, func(_ string) bool { // want `golang.org/x/exp/slices\.IndexFunc\(\) can be replaced by slices\.IndexFunc\(\)`
46+
slices.Index(a, "a")
47+
slices.IndexFunc(a, func(_ string) bool {
4848
return true
4949
})
50-
slices.Contains(a, "a") // want `golang.org/x/exp/slices\.Contains\(\) can be replaced by slices\.Contains\(\)`
51-
slices.ContainsFunc(a, func(_ string) bool { // want `golang.org/x/exp/slices\.ContainsFunc\(\) can be replaced by slices\.ContainsFunc\(\)`
50+
slices.Contains(a, "a")
51+
slices.ContainsFunc(a, func(_ string) bool {
5252
return true
5353
})
54-
slices.Insert(a, 0, "a", "b") // want `golang.org/x/exp/slices\.Insert\(\) can be replaced by slices\.Insert\(\)`
55-
slices.Delete(a, 0, 1) // want `golang.org/x/exp/slices\.Delete\(\) can be replaced by slices\.Delete\(\)`
56-
slices.DeleteFunc(a, func(_ string) bool { // want `golang.org/x/exp/slices\.DeleteFunc\(\) can be replaced by slices\.DeleteFunc\(\)`
54+
slices.Insert(a, 0, "a", "b")
55+
slices.Delete(a, 0, 1)
56+
slices.DeleteFunc(a, func(_ string) bool {
5757
return true
5858
})
59-
slices.Replace(a, 0, 1, "a") // want `golang.org/x/exp/slices\.Replace\(\) can be replaced by slices\.Replace\(\)`
60-
slices.Clone(a) // want `golang.org/x/exp/slices\.Clone\(\) can be replaced by slices\.Clone\(\)`
61-
slices.Compact(a) // want `golang.org/x/exp/slices\.Compact\(\) can be replaced by slices\.Compact\(\)`
62-
slices.CompactFunc(a, func(_ string, _ string) bool { // want `golang.org/x/exp/slices\.CompactFunc\(\) can be replaced by slices\.CompactFunc\(\)`
59+
slices.Replace(a, 0, 1, "a")
60+
slices.Clone(a)
61+
slices.Compact(a)
62+
slices.CompactFunc(a, func(_ string, _ string) bool {
6363
return true
6464
})
65-
slices.Grow(a, 2) // want `golang.org/x/exp/slices\.Grow\(\) can be replaced by slices\.Grow\(\)`
66-
slices.Clip(a) // want `golang.org/x/exp/slices\.Clip\(\) can be replaced by slices\.Clip\(\)`
67-
slices.Reverse(a) // want `golang.org/x/exp/slices\.Reverse\(\) can be replaced by slices\.Reverse\(\)`
68-
slices.Sort(a) // want `golang.org/x/exp/slices\.Sort\(\) can be replaced by slices\.Sort\(\)`
69-
slices.SortFunc(a, func(_, _ string) int { // want `golang.org/x/exp/slices\.SortFunc\(\) can be replaced by slices\.SortFunc\(\)`
65+
slices.Grow(a, 2)
66+
slices.Clip(a)
67+
slices.Reverse(a)
68+
slices.Sort(a)
69+
slices.SortFunc(a, func(_, _ string) int {
7070
return 0
7171
})
72-
slices.SortStableFunc(a, func(_, _ string) int { // want `golang.org/x/exp/slices\.SortStableFunc\(\) can be replaced by slices\.SortStableFunc\(\)`
72+
slices.SortStableFunc(a, func(_, _ string) int {
7373
return 0
7474
})
75-
slices.IsSorted(a) // want `golang.org/x/exp/slices\.IsSorted\(\) can be replaced by slices\.IsSorted\(\)`
76-
slices.IsSortedFunc(a, func(_, _ string) int { // want `golang.org/x/exp/slices\.IsSortedFunc\(\) can be replaced by slices\.IsSortedFunc\(\)`
75+
slices.IsSorted(a)
76+
slices.IsSortedFunc(a, func(_, _ string) int {
7777
return 0
7878
})
79-
slices.Min(a) // want `golang.org/x/exp/slices\.Min\(\) can be replaced by slices\.Min\(\)`
80-
slices.MinFunc(a, func(_, _ string) int { // want `golang.org/x/exp/slices\.MinFunc\(\) can be replaced by slices\.MinFunc\(\)`
79+
slices.Min(a)
80+
slices.MinFunc(a, func(_, _ string) int {
8181
return 0
8282
})
83-
slices.Max(a) // want `golang.org/x/exp/slices\.Max\(\) can be replaced by slices\.Max\(\)`
84-
slices.MaxFunc(a, func(_, _ string) int { // want `golang.org/x/exp/slices\.MaxFunc\(\) can be replaced by slices\.MaxFunc\(\)`
83+
slices.Max(a)
84+
slices.MaxFunc(a, func(_, _ string) int {
8585
return 0
8686
})
87-
slices.BinarySearch(a, "a") // want `golang.org/x/exp/slices\.BinarySearch\(\) can be replaced by slices\.BinarySearch\(\)`
88-
slices.BinarySearchFunc(a, b, func(_ string, _ []string) int { // want `golang.org/x/exp/slices\.BinarySearchFunc\(\) can be replaced by slices\.BinarySearchFunc\(\)`
87+
slices.BinarySearch(a, "a")
88+
slices.BinarySearchFunc(a, b, func(_ string, _ []string) int {
8989
return 0
9090
})
9191
}

0 commit comments

Comments
 (0)