Merge pull request cli#113 from github/staticcheck

mislav · web-flow · commit b21b93abe914 · 2019-11-26T18:31:43.000+01:00
Fix minor code issues discovered by staticcheck
diff --git a/api/queries_issue.go b/api/queries_issue.go
@@ -203,9 +203,5 @@ func IssueList(client *Client, ghRepo Repo, state string, labels []string, assig
 		return nil, err
 	}
 
-	issues := []Issue{}
-	for _, issue := range resp.Repository.Issues.Nodes {
-		issues = append(issues, issue)
-	}
-	return issues, nil
+	return resp.Repository.Issues.Nodes, nil
 }
diff --git a/command/pr_test.go b/command/pr_test.go
@@ -147,7 +147,7 @@ func TestPRView_NoActiveBranch(t *testing.T) {
 	})
 	defer restoreCmd()
 
-	output, err := test.RunCommand(RootCmd, "pr view")
+	_, err := test.RunCommand(RootCmd, "pr view")
 	if err == nil || err.Error() != "the 'master' branch has no open pull requests" {
 		t.Errorf("error running command `pr view`: %v", err)
 	}
@@ -157,7 +157,7 @@ func TestPRView_NoActiveBranch(t *testing.T) {
 	}
 
 	// Now run again but provide a PR number
-	output, err = test.RunCommand(RootCmd, "pr view 23")
+	output, err := test.RunCommand(RootCmd, "pr view 23")
 	if err != nil {
 		t.Errorf("error running command `pr view`: %v", err)
 	}
diff --git a/context/config_setup.go b/context/config_setup.go
@@ -66,6 +66,9 @@ func setupConfigFile(filename string) (*configEntry, error) {
 	defer config.Close()
 
 	yamlData, err := yaml.Marshal(data)
+	if err != nil {
+		return nil, err
+	}
 	n, err := config.Write(yamlData)
 	if err == nil && n < len(yamlData) {
 		err = io.ErrShortWrite

Original file line number	Diff line number	Diff line change
`@@ -203,9 +203,5 @@ func IssueList(client *Client, ghRepo Repo, state string, labels []string, assig`
`203`	`203`	`return nil, err`
`204`	`204`	`}`
`205`	`205`
`206`		`- issues := []Issue{}`
`207`		`- for _, issue := range resp.Repository.Issues.Nodes {`
`208`		`- issues = append(issues, issue)`
`209`		`- }`
`210`		`- return issues, nil`
	`206`	`+ return resp.Repository.Issues.Nodes, nil`
`211`	`207`	`}`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ func TestPRView_NoActiveBranch(t *testing.T) {`
`147`	`147`	`})`
`148`	`148`	`defer restoreCmd()`
`149`	`149`
`150`		`- output, err := test.RunCommand(RootCmd, "pr view")`
	`150`	`+ _, err := test.RunCommand(RootCmd, "pr view")`
`151`	`151`	`if err == nil \|\| err.Error() != "the 'master' branch has no open pull requests" {`
`152`	`152`	t.Errorf("error running command `pr view`: %v", err)
`153`	`153`	`}`
`@@ -157,7 +157,7 @@ func TestPRView_NoActiveBranch(t *testing.T) {`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`// Now run again but provide a PR number`
`160`		`- output, err = test.RunCommand(RootCmd, "pr view 23")`
	`160`	`+ output, err := test.RunCommand(RootCmd, "pr view 23")`
`161`	`161`	`if err != nil {`
`162`	`162`	t.Errorf("error running command `pr view`: %v", err)
`163`	`163`	`}`