diff --git a/testdata/enforce-slice-style-any.go b/testdata/enforce-slice-style-any.go index d5e6b1bb3..77bd4f36e 100644 --- a/testdata/enforce-slice-style-any.go +++ b/testdata/enforce-slice-style-any.go @@ -41,10 +41,10 @@ func somefn2() { type SliceSlice Slice func somefn3() { - m2 := make(SliceSlice, 0) - m3 := make(SliceSlice, 0, 0) m0 := make(SliceSlice, 10) m1 := make(SliceSlice, 0, 10) + m2 := make(SliceSlice, 0) + m3 := make(SliceSlice, 0, 0) m4 := SliceSlice{} m5 := SliceSlice{"v1", "v2"} diff --git a/testdata/enforce-slice-style-literal.go b/testdata/enforce-slice-style-literal.go index 025c9cfd1..636cd4ff1 100644 --- a/testdata/enforce-slice-style-literal.go +++ b/testdata/enforce-slice-style-literal.go @@ -41,10 +41,10 @@ func somefn2() { type SliceSlice Slice func somefn3() { - m2 := make(SliceSlice, 0) // MATCH /use []type{} instead of make([]type, 0) (or declare nil slice)/ - m3 := make(SliceSlice, 0, 0) // MATCH /use []type{} instead of make([]type, 0) (or declare nil slice)/ m0 := make(SliceSlice, 10) m1 := make(SliceSlice, 0, 10) + m2 := make(SliceSlice, 0) // MATCH /use []type{} instead of make([]type, 0) (or declare nil slice)/ + m3 := make(SliceSlice, 0, 0) // MATCH /use []type{} instead of make([]type, 0) (or declare nil slice)/ m4 := SliceSlice{} m5 := SliceSlice{"v1", "v2"} diff --git a/testdata/enforce-slice-style-make.go b/testdata/enforce-slice-style-make.go index 9eb6aabc8..5bee16a69 100644 --- a/testdata/enforce-slice-style-make.go +++ b/testdata/enforce-slice-style-make.go @@ -4,10 +4,11 @@ func somefn() { m0 := make([]string, 10) m1 := make([]string, 0, 10) m2 := make([]string, 0) - m3 := []string{} // MATCH /use make([]type) instead of []type{} (or declare nil slice)/ - m4 := []string{"v1", "v2"} - m5 := [8]string{} - m6 := [...]string{} + m3 := make([]string, 0, 0) + m4 := []string{} // MATCH /use make([]type) instead of []type{} (or declare nil slice)/ + m5 := []string{"v1", "v2"} + m6 := [8]string{} + m7 := [...]string{} _ = m0 _ = m1 @@ -16,6 +17,7 @@ func somefn() { _ = m4 _ = m5 _ = m6 + _ = m7 } type Slice []string @@ -24,14 +26,16 @@ func somefn2() { m0 := make(Slice, 10) m1 := make(Slice, 0, 10) m2 := make(Slice, 0) - m3 := Slice{} // MATCH /use make([]type) instead of []type{} (or declare nil slice)/ - m4 := Slice{"v1", "v2"} + m3 := make(Slice, 0, 0) + m4 := Slice{} // MATCH /use make([]type) instead of []type{} (or declare nil slice)/ + m5 := Slice{"v1", "v2"} _ = m0 _ = m1 _ = m2 _ = m3 _ = m4 + _ = m5 } type SliceSlice Slice @@ -40,14 +44,16 @@ func somefn3() { m0 := make(SliceSlice, 10) m1 := make(SliceSlice, 0, 10) m2 := make(SliceSlice, 0) - m3 := SliceSlice{} // MATCH /use make([]type) instead of []type{} (or declare nil slice)/ - m4 := SliceSlice{"v1", "v2"} + m3 := make(SliceSlice, 0, 0) + m4 := SliceSlice{} // MATCH /use make([]type) instead of []type{} (or declare nil slice)/ + m5 := SliceSlice{"v1", "v2"} _ = m0 _ = m1 _ = m2 _ = m3 _ = m4 + _ = m5 } func somefn4() { @@ -55,8 +61,9 @@ func somefn4() { m1["el0"] = make([]string, 10) m1["el1"] = make([]string, 0, 10) m1["el2"] = make([]string, 0) - m1["el3"] = []string{} // MATCH /use make([]type) instead of []type{} (or declare nil slice)/ - m1["el4"] = []string{"v1", "v2"} + m1["el3"] = make([]string, 0, 0) + m1["el4"] = []string{} // MATCH /use make([]type) instead of []type{} (or declare nil slice)/ + m1["el5"] = []string{"v1", "v2"} _ = m1 }