Merge pull request cli#1177 from cli/simplifycompositelit

Nate Smith · web-flow · commit 54e0534b1bbc · 2020-06-12T10:56:06.000-05:00
Remove redundant type declarations for composite struct literals
diff --git a/.golangci.yml b/.golangci.yml
@@ -0,0 +1,3 @@
+linters:
+  enable:
+    gofmt
diff --git a/context/remote_test.go b/context/remote_test.go
@@ -95,12 +95,12 @@ func Test_resolvedRemotes_triangularSetup(t *testing.T) {
 		},
 		Network: api.RepoNetworkResult{
 			Repositories: []*api.Repository{
-				&api.Repository{
+				{
 					Name:             "NEWNAME",
 					Owner:            api.RepositoryOwner{Login: "NEWOWNER"},
 					ViewerPermission: "READ",
 				},
-				&api.Repository{
+				{
 					Name:             "REPO",
 					Owner:            api.RepositoryOwner{Login: "MYSELF"},
 					ViewerPermission: "ADMIN",
@@ -163,7 +163,7 @@ func Test_resolvedRemotes_forkLookup(t *testing.T) {
 		},
 		Network: api.RepoNetworkResult{
 			Repositories: []*api.Repository{
-				&api.Repository{
+				{
 					Name:             "NEWNAME",
 					Owner:            api.RepositoryOwner{Login: "NEWOWNER"},
 					ViewerPermission: "READ",
@@ -196,7 +196,7 @@ func Test_resolvedRemotes_clonedFork(t *testing.T) {
 		},
 		Network: api.RepoNetworkResult{
 			Repositories: []*api.Repository{
-				&api.Repository{
+				{
 					Name:             "REPO",
 					Owner:            api.RepositoryOwner{Login: "OWNER"},
 					ViewerPermission: "ADMIN",
diff --git a/git/git_test.go b/git/git_test.go
@@ -15,9 +15,9 @@ func Test_UncommittedChangeCount(t *testing.T) {
 		Output   string
 	}
 	cases := []c{
-		c{Label: "no changes", Expected: 0, Output: ""},
-		c{Label: "one change", Expected: 1, Output: " M poem.txt"},
-		c{Label: "untracked file", Expected: 2, Output: " M poem.txt\n?? new.txt"},
+		{Label: "no changes", Expected: 0, Output: ""},
+		{Label: "one change", Expected: 1, Output: " M poem.txt"},
+		{Label: "untracked file", Expected: 2, Output: " M poem.txt\n?? new.txt"},
 	}
 
 	teardown := run.SetPrepareCmd(func(*exec.Cmd) run.Runnable {
diff --git a/git/ssh_config_test.go b/git/ssh_config_test.go
@@ -36,9 +36,9 @@ func Test_Translator(t *testing.T) {
 	tr := m.Translator()
 
 	cases := [][]string{
-		[]string{"ssh://gh/o/r", "ssh://github.com/o/r"},
-		[]string{"ssh://github.com/o/r", "ssh://github.com/o/r"},
-		[]string{"https://gh/o/r", "https://gh/o/r"},
+		{"ssh://gh/o/r", "ssh://github.com/o/r"},
+		{"ssh://github.com/o/r", "ssh://github.com/o/r"},
+		{"https://gh/o/r", "https://gh/o/r"},
 	}
 	for _, c := range cases {
 		u, _ := url.Parse(c[0])

Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,9 @@ func Test_UncommittedChangeCount(t *testing.T) {`
`15`	`15`	`Output string`
`16`	`16`	`}`
`17`	`17`	`cases := []c{`
`18`		`- c{Label: "no changes", Expected: 0, Output: ""},`
`19`		`- c{Label: "one change", Expected: 1, Output: " M poem.txt"},`
`20`		`- c{Label: "untracked file", Expected: 2, Output: " M poem.txt\n?? new.txt"},`
	`18`	`+ {Label: "no changes", Expected: 0, Output: ""},`
	`19`	`+ {Label: "one change", Expected: 1, Output: " M poem.txt"},`
	`20`	`+ {Label: "untracked file", Expected: 2, Output: " M poem.txt\n?? new.txt"},`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`teardown := run.SetPrepareCmd(func(*exec.Cmd) run.Runnable {`