Use an array

probablycorey · probablycorey · commit 15770881bb5b · 2020-05-27T10:08:29.000-07:00
diff --git a/command/pr.go b/command/pr.go
@@ -315,7 +315,7 @@ func prView(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	pr, err := prFromArgs(ctx, apiClient, baseRepo, args...)
+	pr, err := prFromArgs(ctx, apiClient, baseRepo, args)
 	if err != nil {
 		return err
 	}
@@ -342,7 +342,7 @@ func prClose(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	pr, err := prFromArgs(ctx, apiClient, baseRepo, args...)
+	pr, err := prFromArgs(ctx, apiClient, baseRepo, args)
 	if err != nil {
 		return err
 	}
@@ -377,7 +377,7 @@ func prReopen(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	pr, err := prFromArgs(ctx, apiClient, baseRepo, args...)
+	pr, err := prFromArgs(ctx, apiClient, baseRepo, args)
 	if err != nil {
 		return err
 	}
@@ -414,7 +414,7 @@ func prMerge(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	pr, err := prFromArgs(ctx, apiClient, baseRepo, args...)
+	pr, err := prFromArgs(ctx, apiClient, baseRepo, args)
 	if err != nil {
 		return err
 	}
@@ -657,7 +657,7 @@ func prReady(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	pr, err := prFromArgs(ctx, apiClient, baseRepo, args...)
+	pr, err := prFromArgs(ctx, apiClient, baseRepo, args)
 	if err != nil {
 		return err
 	}
diff --git a/command/pr_checkout.go b/command/pr_checkout.go
@@ -42,7 +42,7 @@ func prCheckout(cmd *cobra.Command, args []string) error {
 		}
 	}
 
-	pr, err := prFromArgs(ctx, apiClient, baseRepo, prString)
+	pr, err := prFromArgs(ctx, apiClient, baseRepo, []string{prString})
 	if err != nil {
 		return err
 	}
diff --git a/command/pr_diff.go b/command/pr_diff.go
@@ -41,7 +41,7 @@ func prDiff(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("could not determine base repo: %w", err)
 	}
 
-	pr, err := prFromArgs(ctx, apiClient, baseRepo, args...)
+	pr, err := prFromArgs(ctx, apiClient, baseRepo, args)
 	if err != nil {
 		return fmt.Errorf("could not find pull request: %w", err)
 	}
diff --git a/command/pr_lookup.go b/command/pr_lookup.go
@@ -12,7 +12,7 @@ import (
 	"github.com/cli/cli/internal/ghrepo"
 )
 
-func prFromArgs(ctx context.Context, apiClient *api.Client, repo ghrepo.Interface, args ...string) (*api.PullRequest, error) {
+func prFromArgs(ctx context.Context, apiClient *api.Client, repo ghrepo.Interface, args []string) (*api.PullRequest, error) {
 	if len(args) == 0 {
 		return prForCurrentBranch(ctx, apiClient, repo)
 	}
diff --git a/command/pr_review.go b/command/pr_review.go
@@ -94,7 +94,7 @@ func prReview(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("could not determine base repo: %w", err)
 	}
 
-	pr, err := prFromArgs(ctx, apiClient, baseRepo, args...)
+	pr, err := prFromArgs(ctx, apiClient, baseRepo, args)
 	if err != nil {
 		return err
 	}

Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,7 @@ func prView(cmd *cobra.Command, args []string) error {`
`315`	`315`	`return err`
`316`	`316`	`}`
`317`	`317`
`318`		`- pr, err := prFromArgs(ctx, apiClient, baseRepo, args...)`
	`318`	`+ pr, err := prFromArgs(ctx, apiClient, baseRepo, args)`
`319`	`319`	`if err != nil {`
`320`	`320`	`return err`
`321`	`321`	`}`
`@@ -342,7 +342,7 @@ func prClose(cmd *cobra.Command, args []string) error {`
`342`	`342`	`return err`
`343`	`343`	`}`
`344`	`344`
`345`		`- pr, err := prFromArgs(ctx, apiClient, baseRepo, args...)`
	`345`	`+ pr, err := prFromArgs(ctx, apiClient, baseRepo, args)`
`346`	`346`	`if err != nil {`
`347`	`347`	`return err`
`348`	`348`	`}`
`@@ -377,7 +377,7 @@ func prReopen(cmd *cobra.Command, args []string) error {`
`377`	`377`	`return err`
`378`	`378`	`}`
`379`	`379`
`380`		`- pr, err := prFromArgs(ctx, apiClient, baseRepo, args...)`
	`380`	`+ pr, err := prFromArgs(ctx, apiClient, baseRepo, args)`
`381`	`381`	`if err != nil {`
`382`	`382`	`return err`
`383`	`383`	`}`
`@@ -414,7 +414,7 @@ func prMerge(cmd *cobra.Command, args []string) error {`
`414`	`414`	`return err`
`415`	`415`	`}`
`416`	`416`
`417`		`- pr, err := prFromArgs(ctx, apiClient, baseRepo, args...)`
	`417`	`+ pr, err := prFromArgs(ctx, apiClient, baseRepo, args)`
`418`	`418`	`if err != nil {`
`419`	`419`	`return err`
`420`	`420`	`}`
`@@ -657,7 +657,7 @@ func prReady(cmd *cobra.Command, args []string) error {`
`657`	`657`	`return err`
`658`	`658`	`}`
`659`	`659`
`660`		`- pr, err := prFromArgs(ctx, apiClient, baseRepo, args...)`
	`660`	`+ pr, err := prFromArgs(ctx, apiClient, baseRepo, args)`
`661`	`661`	`if err != nil {`
`662`	`662`	`return err`
`663`	`663`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ func prCheckout(cmd *cobra.Command, args []string) error {`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
`45`		`- pr, err := prFromArgs(ctx, apiClient, baseRepo, prString)`
	`45`	`+ pr, err := prFromArgs(ctx, apiClient, baseRepo, []string{prString})`
`46`	`46`	`if err != nil {`
`47`	`47`	`return err`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ func prDiff(cmd *cobra.Command, args []string) error {`
`41`	`41`	`return fmt.Errorf("could not determine base repo: %w", err)`
`42`	`42`	`}`
`43`	`43`
`44`		`- pr, err := prFromArgs(ctx, apiClient, baseRepo, args...)`
	`44`	`+ pr, err := prFromArgs(ctx, apiClient, baseRepo, args)`
`45`	`45`	`if err != nil {`
`46`	`46`	`return fmt.Errorf("could not find pull request: %w", err)`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`	`"github.com/cli/cli/internal/ghrepo"`
`13`	`13`	`)`
`14`	`14`
`15`		`-func prFromArgs(ctx context.Context, apiClient api.Client, repo ghrepo.Interface, args ...string) (api.PullRequest, error) {`
	`15`	`+func prFromArgs(ctx context.Context, apiClient api.Client, repo ghrepo.Interface, args []string) (api.PullRequest, error) {`
`16`	`16`	`if len(args) == 0 {`
`17`	`17`	`return prForCurrentBranch(ctx, apiClient, repo)`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ func prReview(cmd *cobra.Command, args []string) error {`
`94`	`94`	`return fmt.Errorf("could not determine base repo: %w", err)`
`95`	`95`	`}`
`96`	`96`
`97`		`- pr, err := prFromArgs(ctx, apiClient, baseRepo, args...)`
	`97`	`+ pr, err := prFromArgs(ctx, apiClient, baseRepo, args)`
`98`	`98`	`if err != nil {`
`99`	`99`	`return err`
`100`	`100`	`}`