Remove unnecessary pointers to Go maps

mislav · mislav · commit 83a08aa3ba12 · 2021-10-25T17:20:12.000+02:00
diff --git a/api/export_pr.go b/api/export_pr.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 )
 
-func (issue *Issue) ExportData(fields []string) *map[string]interface{} {
+func (issue *Issue) ExportData(fields []string) map[string]interface{} {
 	v := reflect.ValueOf(issue).Elem()
 	data := map[string]interface{}{}
 
@@ -25,10 +25,10 @@ func (issue *Issue) ExportData(fields []string) *map[string]interface{} {
 		}
 	}
 
-	return &data
+	return data
 }
 
-func (pr *PullRequest) ExportData(fields []string) *map[string]interface{} {
+func (pr *PullRequest) ExportData(fields []string) map[string]interface{} {
 	v := reflect.ValueOf(pr).Elem()
 	data := map[string]interface{}{}
 
@@ -102,7 +102,7 @@ func (pr *PullRequest) ExportData(fields []string) *map[string]interface{} {
 		}
 	}
 
-	return &data
+	return data
 }
 
 func fieldByName(v reflect.Value, field string) reflect.Value {
diff --git a/api/export_repo.go b/api/export_repo.go
@@ -4,7 +4,7 @@ import (
 	"reflect"
 )
 
-func (repo *Repository) ExportData(fields []string) *map[string]interface{} {
+func (repo *Repository) ExportData(fields []string) map[string]interface{} {
 	v := reflect.ValueOf(repo).Elem()
 	data := map[string]interface{}{}
 
@@ -38,7 +38,7 @@ func (repo *Repository) ExportData(fields []string) *map[string]interface{} {
 		}
 	}
 
-	return &data
+	return data
 }
 
 func miniRepoExport(r *Repository) map[string]interface{} {
diff --git a/internal/codespaces/api/api.go b/internal/codespaces/api/api.go
@@ -189,7 +189,7 @@ var CodespaceFields = []string{
 	"lastUsedAt",
 }
 
-func (c *Codespace) ExportData(fields []string) *map[string]interface{} {
+func (c *Codespace) ExportData(fields []string) map[string]interface{} {
 	v := reflect.ValueOf(c).Elem()
 	data := map[string]interface{}{}
 
@@ -213,7 +213,7 @@ func (c *Codespace) ExportData(fields []string) *map[string]interface{} {
 		}
 	}
 
-	return &data
+	return data
 }
 
 // ListCodespaces returns a list of codespaces for the user. Pass a negative limit to request all pages from
diff --git a/pkg/cmd/codespace/ports.go b/pkg/cmd/codespace/ports.go
@@ -143,7 +143,7 @@ var portFields = []string{
 	"browseUrl",
 }
 
-func (pi *portInfo) ExportData(fields []string) *map[string]interface{} {
+func (pi *portInfo) ExportData(fields []string) map[string]interface{} {
 	data := map[string]interface{}{}
 
 	for _, f := range fields {
@@ -163,7 +163,7 @@ func (pi *portInfo) ExportData(fields []string) *map[string]interface{} {
 		}
 	}
 
-	return &data
+	return data
 }
 
 type devContainerResult struct {
diff --git a/pkg/cmd/release/shared/fetch.go b/pkg/cmd/release/shared/fetch.go
@@ -74,7 +74,7 @@ type ReleaseAsset struct {
 	BrowserDownloadURL string    `json:"browser_download_url"`
 }
 
-func (rel *Release) ExportData(fields []string) *map[string]interface{} {
+func (rel *Release) ExportData(fields []string) map[string]interface{} {
 	v := reflect.ValueOf(rel).Elem()
 	fieldByName := func(v reflect.Value, field string) reflect.Value {
 		return v.FieldByNameFunc(func(s string) bool {
@@ -114,7 +114,7 @@ func (rel *Release) ExportData(fields []string) *map[string]interface{} {
 		}
 	}
 
-	return &data
+	return data
 }
 
 // FetchRelease finds a repository release by its tagName.
diff --git a/pkg/cmdutil/json_flags.go b/pkg/cmdutil/json_flags.go
@@ -179,7 +179,7 @@ func (e *exportFormat) exportData(v reflect.Value) interface{} {
 }
 
 type exportable interface {
-	ExportData([]string) *map[string]interface{}
+	ExportData([]string) map[string]interface{}
 }
 
 var exportableType = reflect.TypeOf((*exportable)(nil)).Elem()
diff --git a/pkg/cmdutil/json_flags_test.go b/pkg/cmdutil/json_flags_test.go
@@ -198,10 +198,10 @@ type exportableItem struct {
 	Name string
 }
 
-func (e *exportableItem) ExportData(fields []string) *map[string]interface{} {
+func (e *exportableItem) ExportData(fields []string) map[string]interface{} {
 	m := map[string]interface{}{}
 	for _, f := range fields {
 		m[f] = fmt.Sprintf("%s:%s", e.Name, f)
 	}
-	return &m
+	return m
 }

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"strings"`
`6`	`6`	`)`
`7`	`7`
`8`		`-func (issue Issue) ExportData(fields []string) map[string]interface{} {`
	`8`	`+func (issue *Issue) ExportData(fields []string) map[string]interface{} {`
`9`	`9`	`v := reflect.ValueOf(issue).Elem()`
`10`	`10`	`data := map[string]interface{}{}`
`11`	`11`
`@@ -25,10 +25,10 @@ func (issue Issue) ExportData(fields []string) map[string]interface{} {`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`
`28`		`- return &data`
	`28`	`+ return data`
`29`	`29`	`}`
`30`	`30`
`31`		`-func (pr PullRequest) ExportData(fields []string) map[string]interface{} {`
	`31`	`+func (pr *PullRequest) ExportData(fields []string) map[string]interface{} {`
`32`	`32`	`v := reflect.ValueOf(pr).Elem()`
`33`	`33`	`data := map[string]interface{}{}`
`34`	`34`
`@@ -102,7 +102,7 @@ func (pr PullRequest) ExportData(fields []string) map[string]interface{} {`
`102`	`102`	`}`
`103`	`103`	`}`
`104`	`104`
`105`		`- return &data`
	`105`	`+ return data`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`func fieldByName(v reflect.Value, field string) reflect.Value {`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"reflect"`
`5`	`5`	`)`
`6`	`6`
`7`		`-func (repo Repository) ExportData(fields []string) map[string]interface{} {`
	`7`	`+func (repo *Repository) ExportData(fields []string) map[string]interface{} {`
`8`	`8`	`v := reflect.ValueOf(repo).Elem()`
`9`	`9`	`data := map[string]interface{}{}`
`10`	`10`
`@@ -38,7 +38,7 @@ func (repo Repository) ExportData(fields []string) map[string]interface{} {`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`
`41`		`- return &data`
	`41`	`+ return data`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`func miniRepoExport(r *Repository) map[string]interface{} {`
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ var CodespaceFields = []string{`
`189`	`189`	`"lastUsedAt",`
`190`	`190`	`}`
`191`	`191`
`192`		`-func (c Codespace) ExportData(fields []string) map[string]interface{} {`
	`192`	`+func (c *Codespace) ExportData(fields []string) map[string]interface{} {`
`193`	`193`	`v := reflect.ValueOf(c).Elem()`
`194`	`194`	`data := map[string]interface{}{}`
`195`	`195`
`@@ -213,7 +213,7 @@ func (c Codespace) ExportData(fields []string) map[string]interface{} {`
`213`	`213`	`}`
`214`	`214`	`}`
`215`	`215`
`216`		`- return &data`
	`216`	`+ return data`
`217`	`217`	`}`
`218`	`218`
`219`	`219`	`// ListCodespaces returns a list of codespaces for the user. Pass a negative limit to request all pages from`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ var portFields = []string{`
`143`	`143`	`"browseUrl",`
`144`	`144`	`}`
`145`	`145`
`146`		`-func (pi portInfo) ExportData(fields []string) map[string]interface{} {`
	`146`	`+func (pi *portInfo) ExportData(fields []string) map[string]interface{} {`
`147`	`147`	`data := map[string]interface{}{}`
`148`	`148`
`149`	`149`	`for _, f := range fields {`
`@@ -163,7 +163,7 @@ func (pi portInfo) ExportData(fields []string) map[string]interface{} {`
`163`	`163`	`}`
`164`	`164`	`}`
`165`	`165`
`166`		`- return &data`
	`166`	`+ return data`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`type devContainerResult struct {`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ type ReleaseAsset struct {`
`74`	`74`	BrowserDownloadURL string `json:"browser_download_url"`
`75`	`75`	`}`
`76`	`76`
`77`		`-func (rel Release) ExportData(fields []string) map[string]interface{} {`
	`77`	`+func (rel *Release) ExportData(fields []string) map[string]interface{} {`
`78`	`78`	`v := reflect.ValueOf(rel).Elem()`
`79`	`79`	`fieldByName := func(v reflect.Value, field string) reflect.Value {`
`80`	`80`	`return v.FieldByNameFunc(func(s string) bool {`
`@@ -114,7 +114,7 @@ func (rel Release) ExportData(fields []string) map[string]interface{} {`
`114`	`114`	`}`
`115`	`115`	`}`
`116`	`116`
`117`		`- return &data`
	`117`	`+ return data`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`// FetchRelease finds a repository release by its tagName.`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ func (e *exportFormat) exportData(v reflect.Value) interface{} {`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`type exportable interface {`
`182`		`- ExportData([]string) *map[string]interface{}`
	`182`	`+ ExportData([]string) map[string]interface{}`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`var exportableType = reflect.TypeOf((*exportable)(nil)).Elem()`
Original file line number	Diff line number	Diff line change
`@@ -198,10 +198,10 @@ type exportableItem struct {`
`198`	`198`	`Name string`
`199`	`199`	`}`
`200`	`200`
`201`		`-func (e exportableItem) ExportData(fields []string) map[string]interface{} {`
	`201`	`+func (e *exportableItem) ExportData(fields []string) map[string]interface{} {`
`202`	`202`	`m := map[string]interface{}{}`
`203`	`203`	`for _, f := range fields {`
`204`	`204`	`m[f] = fmt.Sprintf("%s:%s", e.Name, f)`
`205`	`205`	`}`
`206`		`- return &m`
	`206`	`+ return m`
`207`	`207`	`}`