Merge pull request #43 from aotimme/gofmt-simplify

Run `gofmt` with simplify to remove `simplifycompositelit` alerts.
aotimme · Nov 30, 2021 · 5924c92 · 5924c92
2 parents 8b0d0a6 + 032e4cb
commit 5924c92
Show file tree

Hide file tree

Showing 16 changed files with 202 additions and 202 deletions.
diff --git a/cmd/add_test.go b/cmd/add_test.go
@@ -13,25 +13,25 @@ func TestRunAdd(t *testing.T) {
 		rows     [][]string
 	}{
 		{"", "Row {{.index}}: {{.Number}} ({{.String}})", false, [][]string{
-			[]string{"Number", "String", ""},
-			[]string{"1", "One", "Row 1: 1 (One)"},
-			[]string{"2", "Two", "Row 2: 2 (Two)"},
-			[]string{"-1", "Minus One", "Row 3: -1 (Minus One)"},
-			[]string{"2", "Another Two", "Row 4: 2 (Another Two)"},
+			{"Number", "String", ""},
+			{"1", "One", "Row 1: 1 (One)"},
+			{"2", "Two", "Row 2: 2 (Two)"},
+			{"-1", "Minus One", "Row 3: -1 (Minus One)"},
+			{"2", "Another Two", "Row 4: 2 (Another Two)"},
 		}},
 		{"Long Version", "Row {{.index}}: {{.Number}} ({{.String}})", false, [][]string{
-			[]string{"Number", "String", "Long Version"},
-			[]string{"1", "One", "Row 1: 1 (One)"},
-			[]string{"2", "Two", "Row 2: 2 (Two)"},
-			[]string{"-1", "Minus One", "Row 3: -1 (Minus One)"},
-			[]string{"2", "Another Two", "Row 4: 2 (Another Two)"},
+			{"Number", "String", "Long Version"},
+			{"1", "One", "Row 1: 1 (One)"},
+			{"2", "Two", "Row 2: 2 (Two)"},
+			{"-1", "Minus One", "Row 3: -1 (Minus One)"},
+			{"2", "Another Two", "Row 4: 2 (Another Two)"},
 		}},
 		{"", "Row {{.index}}: {{.Number}} ({{.String}})", true, [][]string{
-			[]string{"", "Number", "String"},
-			[]string{"Row 1: 1 (One)", "1", "One"},
-			[]string{"Row 2: 2 (Two)", "2", "Two"},
-			[]string{"Row 3: -1 (Minus One)", "-1", "Minus One"},
-			[]string{"Row 4: 2 (Another Two)", "2", "Another Two"},
+			{"", "Number", "String"},
+			{"Row 1: 1 (One)", "1", "One"},
+			{"Row 2: 2 (Two)", "2", "Two"},
+			{"Row 3: -1 (Minus One)", "-1", "Minus One"},
+			{"Row 4: 2 (Another Two)", "2", "Another Two"},
 		}},
 	}
 	for i, tt := range testCases {

diff --git a/cmd/autoincrement_test.go b/cmd/autoincrement_test.go
@@ -13,32 +13,32 @@ func TestRunAutoincrement(t *testing.T) {
 		rows    [][]string
 	}{
 		{"ID", 1, false, [][]string{
-			[]string{"Number", "String", "ID"},
-			[]string{"1", "One", "1"},
-			[]string{"2", "Two", "2"},
-			[]string{"-1", "Minus One", "3"},
-			[]string{"2", "Another Two", "4"},
+			{"Number", "String", "ID"},
+			{"1", "One", "1"},
+			{"2", "Two", "2"},
+			{"-1", "Minus One", "3"},
+			{"2", "Another Two", "4"},
 		}},
 		{"ID", 0, false, [][]string{
-			[]string{"Number", "String", "ID"},
-			[]string{"1", "One", "0"},
-			[]string{"2", "Two", "1"},
-			[]string{"-1", "Minus One", "2"},
-			[]string{"2", "Another Two", "3"},
+			{"Number", "String", "ID"},
+			{"1", "One", "0"},
+			{"2", "Two", "1"},
+			{"-1", "Minus One", "2"},
+			{"2", "Another Two", "3"},
 		}},
 		{"PKEY", 1, false, [][]string{
-			[]string{"Number", "String", "PKEY"},
-			[]string{"1", "One", "1"},
-			[]string{"2", "Two", "2"},
-			[]string{"-1", "Minus One", "3"},
-			[]string{"2", "Another Two", "4"},
+			{"Number", "String", "PKEY"},
+			{"1", "One", "1"},
+			{"2", "Two", "2"},
+			{"-1", "Minus One", "3"},
+			{"2", "Another Two", "4"},
 		}},
 		{"ID", 1, true, [][]string{
-			[]string{"ID", "Number", "String"},
-			[]string{"1", "1", "One"},
-			[]string{"2", "2", "Two"},
-			[]string{"3", "-1", "Minus One"},
-			[]string{"4", "2", "Another Two"},
+			{"ID", "Number", "String"},
+			{"1", "1", "One"},
+			{"2", "2", "Two"},
+			{"3", "-1", "Minus One"},
+			{"4", "2", "Another Two"},
 		}},
 	}
 	for i, tt := range testCases {

diff --git a/cmd/behead_test.go b/cmd/behead_test.go
@@ -11,15 +11,15 @@ func TestRunBehead(t *testing.T) {
 		rows       [][]string
 	}{
 		{1, [][]string{
-			[]string{"1", "One"},
-			[]string{"2", "Two"},
-			[]string{"-1", "Minus One"},
-			[]string{"2", "Another Two"},
+			{"1", "One"},
+			{"2", "Two"},
+			{"-1", "Minus One"},
+			{"2", "Another Two"},
 		}},
 		{2, [][]string{
-			[]string{"2", "Two"},
-			[]string{"-1", "Minus One"},
-			[]string{"2", "Another Two"},
+			{"2", "Two"},
+			{"-1", "Minus One"},
+			{"2", "Another Two"},
 		}},
 	}
 	for i, tt := range testCases {

diff --git a/cmd/cap_test.go b/cmd/cap_test.go
@@ -13,28 +13,28 @@ func TestRunCap(t *testing.T) {
 		rows          [][]string
 	}{
 		{"Numero,Cadena", false, "", [][]string{
-			[]string{"Numero", "Cadena"},
-			[]string{"Number", "String"},
-			[]string{"1", "One"},
-			[]string{"2", "Two"},
-			[]string{"-1", "Minus One"},
-			[]string{"2", "Another Two"},
+			{"Numero", "Cadena"},
+			{"Number", "String"},
+			{"1", "One"},
+			{"2", "Two"},
+			{"-1", "Minus One"},
+			{"2", "Another Two"},
 		}},
 		{"Numero,Cadena,Otro", true, "", [][]string{
-			[]string{"Numero", "Cadena"},
-			[]string{"Number", "String"},
-			[]string{"1", "One"},
-			[]string{"2", "Two"},
-			[]string{"-1", "Minus One"},
-			[]string{"2", "Another Two"},
+			{"Numero", "Cadena"},
+			{"Number", "String"},
+			{"1", "One"},
+			{"2", "Two"},
+			{"-1", "Minus One"},
+			{"2", "Another Two"},
 		}},
 		{"Numero", false, "Column", [][]string{
-			[]string{"Numero", "Column"},
-			[]string{"Number", "String"},
-			[]string{"1", "One"},
-			[]string{"2", "Two"},
-			[]string{"-1", "Minus One"},
-			[]string{"2", "Another Two"},
+			{"Numero", "Column"},
+			{"Number", "String"},
+			{"1", "One"},
+			{"2", "Two"},
+			{"-1", "Minus One"},
+			{"2", "Another Two"},
 		}},
 	}
 	for i, tt := range testCases {

diff --git a/cmd/filter_test.go b/cmd/filter_test.go
@@ -20,44 +20,44 @@ func TestRunFilter(t *testing.T) {
 	}{
 		// gt
 		{"Number", false, "", "", false, "1", "", "", "", [][]string{
-			[]string{"Number", "String"},
-			[]string{"2", "Two"},
-			[]string{"2", "Another Two"},
+			{"Number", "String"},
+			{"2", "Two"},
+			{"2", "Another Two"},
 		}},
 		// gte
 		{"Number", false, "", "", false, "", "1", "", "", [][]string{
-			[]string{"Number", "String"},
-			[]string{"1", "One"},
-			[]string{"2", "Two"},
-			[]string{"2", "Another Two"},
+			{"Number", "String"},
+			{"1", "One"},
+			{"2", "Two"},
+			{"2", "Another Two"},
 		}},
 		// lt
 		{"Number", false, "", "", false, "", "", "1", "", [][]string{
-			[]string{"Number", "String"},
-			[]string{"-1", "Minus One"},
+			{"Number", "String"},
+			{"-1", "Minus One"},
 		}},
 		// lte
 		{"Number", false, "", "", false, "", "", "", "1", [][]string{
-			[]string{"Number", "String"},
-			[]string{"1", "One"},
-			[]string{"-1", "Minus One"},
+			{"Number", "String"},
+			{"1", "One"},
+			{"-1", "Minus One"},
 		}},
 		// equals
 		{"String", false, "", "Two", false, "", "", "", "", [][]string{
-			[]string{"Number", "String"},
-			[]string{"2", "Two"},
+			{"Number", "String"},
+			{"2", "Two"},
 		}},
 		// regex
 		{"String", false, "[tT]wo", "", false, "", "", "", "", [][]string{
-			[]string{"Number", "String"},
-			[]string{"2", "Two"},
-			[]string{"2", "Another Two"},
+			{"Number", "String"},
+			{"2", "Two"},
+			{"2", "Another Two"},
 		}},
 		// regex exclude
 		{"String", true, "[oO]ne", "", false, "", "", "", "", [][]string{
-			[]string{"Number", "String"},
-			[]string{"2", "Two"},
-			[]string{"2", "Another Two"},
+			{"Number", "String"},
+			{"2", "Two"},
+			{"2", "Another Two"},
 		}},
 	}
 	for i, tt := range testCases {

diff --git a/cmd/head_test.go b/cmd/head_test.go
@@ -11,24 +11,24 @@ func TestRunHead(t *testing.T) {
 		rows       [][]string
 	}{
 		{"1", [][]string{
-			[]string{"Number", "String"},
-			[]string{"1", "One"},
+			{"Number", "String"},
+			{"1", "One"},
 		}},
 		{"0", [][]string{
-			[]string{"Number", "String"},
+			{"Number", "String"},
 		}},
 		{"+1", [][]string{
-			[]string{"Number", "String"},
-			[]string{"1", "One"},
-			[]string{"2", "Two"},
-			[]string{"-1", "Minus One"},
+			{"Number", "String"},
+			{"1", "One"},
+			{"2", "Two"},
+			{"-1", "Minus One"},
 		}},
 		{"1000", [][]string{
-			[]string{"Number", "String"},
-			[]string{"1", "One"},
-			[]string{"2", "Two"},
-			[]string{"-1", "Minus One"},
-			[]string{"2", "Another Two"},
+			{"Number", "String"},
+			{"1", "One"},
+			{"2", "Two"},
+			{"-1", "Minus One"},
+			{"2", "Another Two"},
 		}},
 	}
 	for i, tt := range testCases {

diff --git a/cmd/input_csv_test.go b/cmd/input_csv_test.go
@@ -34,8 +34,8 @@ func TestReadAll(t *testing.T) {
 		t.Error("Expected 2 rows but got", len(rows))
 	}
 	expected := [][]string{
-		[]string{"Name", "Website"},
-		[]string{"DataFox Intelligence, Inc.", "www.datafox.com"},
+		{"Name", "Website"},
+		{"DataFox Intelligence, Inc.", "www.datafox.com"},
 	}
 	for i, row := range expected {
 		for j, cell := range row {

diff --git a/cmd/rename_test.go b/cmd/rename_test.go
@@ -12,11 +12,11 @@ func TestRunRename(t *testing.T) {
 		rows          [][]string
 	}{
 		{"Number,String", "Numero,Cadena", [][]string{
-			[]string{"Numero", "Cadena"},
-			[]string{"1", "One"},
-			[]string{"2", "Two"},
-			[]string{"-1", "Minus One"},
-			[]string{"2", "Another Two"},
+			{"Numero", "Cadena"},
+			{"1", "One"},
+			{"2", "Two"},
+			{"-1", "Minus One"},
+			{"2", "Another Two"},
 		}},
 	}
 	for i, tt := range testCases {

diff --git a/cmd/replace_test.go b/cmd/replace_test.go
@@ -14,18 +14,18 @@ func TestRunReplace(t *testing.T) {
 		rows            [][]string
 	}{
 		{"String", "Two", "Dos", false, [][]string{
-			[]string{"Number", "String"},
-			[]string{"1", "One"},
-			[]string{"2", "Dos"},
-			[]string{"-1", "Minus One"},
-			[]string{"2", "Another Dos"},
+			{"Number", "String"},
+			{"1", "One"},
+			{"2", "Dos"},
+			{"-1", "Minus One"},
+			{"2", "Another Dos"},
 		}},
 		{"String", "^one", "UNO", true, [][]string{
-			[]string{"Number", "String"},
-			[]string{"1", "UNO"},
-			[]string{"2", "Two"},
-			[]string{"-1", "Minus One"},
-			[]string{"2", "Another Two"},
+			{"Number", "String"},
+			{"1", "UNO"},
+			{"2", "Two"},
+			{"-1", "Minus One"},
+			{"2", "Another Two"},
 		}},
 	}
 	for i, tt := range testCases {

diff --git a/cmd/select_test.go b/cmd/select_test.go
@@ -12,25 +12,25 @@ func TestRunSelect(t *testing.T) {
 		rows          [][]string
 	}{
 		{"String", false, [][]string{
-			[]string{"String"},
-			[]string{"One"},
-			[]string{"Two"},
-			[]string{"Minus One"},
-			[]string{"Another Two"},
+			{"String"},
+			{"One"},
+			{"Two"},
+			{"Minus One"},
+			{"Another Two"},
 		}},
 		{"Number", true, [][]string{
-			[]string{"String"},
-			[]string{"One"},
-			[]string{"Two"},
-			[]string{"Minus One"},
-			[]string{"Another Two"},
+			{"String"},
+			{"One"},
+			{"Two"},
+			{"Minus One"},
+			{"Another Two"},
 		}},
 		{"String,Number", false, [][]string{
-			[]string{"String", "Number"},
-			[]string{"One", "1"},
-			[]string{"Two", "2"},
-			[]string{"Minus One", "-1"},
-			[]string{"Another Two", "2"},
+			{"String", "Number"},
+			{"One", "1"},
+			{"Two", "2"},
+			{"Minus One", "-1"},
+			{"Another Two", "2"},
 		}},
 	}
 	for i, tt := range testCases {