Skip to content

Commit

Permalink
Remove superfluous type specification
Browse files Browse the repository at this point in the history 
The type of the value in the map is inferred from the map type, so is
superfluous. gofmt -s simplifies this away, and so can we.

Remove an extraneous use of format.Source.

Originally submitted by Johan Brandhorst (@johanbrandhorst).

Fixes #35.
Fixes #36.
  • Loading branch information
@johanbrandhorst @kevinburke
johanbrandhorst authored and kevinburke committed Oct 31, 2020
1 parent 60ffea5 commit d86eec4
Show file tree
Hide file tree
Showing 8 changed files with 101 additions and 104 deletions.
1 change: 1 addition & 0 deletions AUTHORS.txt
View file
Expand Up @@ -15,6 +15,7 @@ Ian Kent <email@iankent.co.uk>
Jens Breitbart <jbreitbart@gmail.com>
Jessica Forrester <jforrest@redhat.com>
Jim Teeuwen <jimteeuwen@gmail.com>
Johan Brandhorst <johan.brandhorst@gmail.com>
Jordan Liggitt <jordan@liggitt.net>
Joseph Hager <ajhager@gmail.com>
Keegan Carruthers-Smith <keegan.csmith@gmail.com>
Expand Down
104 changes: 52 additions & 52 deletions testdata/assets/bindata.go
View file
Expand Up @@ -1178,58 +1178,58 @@ type bintree struct {
}

var _bintree = &bintree{nil, map[string]*bintree{
"testdata": &bintree{nil, map[string]*bintree{
"benchmark": &bintree{nil, map[string]*bintree{
"0.jpg": &bintree{testdataBenchmark0Jpg, map[string]*bintree{}},
"1.jpg": &bintree{testdataBenchmark1Jpg, map[string]*bintree{}},
"10.jpg": &bintree{testdataBenchmark10Jpg, map[string]*bintree{}},
"11.jpg": &bintree{testdataBenchmark11Jpg, map[string]*bintree{}},
"12.jpg": &bintree{testdataBenchmark12Jpg, map[string]*bintree{}},
"13.jpg": &bintree{testdataBenchmark13Jpg, map[string]*bintree{}},
"14.jpg": &bintree{testdataBenchmark14Jpg, map[string]*bintree{}},
"15.jpg": &bintree{testdataBenchmark15Jpg, map[string]*bintree{}},
"16.jpg": &bintree{testdataBenchmark16Jpg, map[string]*bintree{}},
"17.jpg": &bintree{testdataBenchmark17Jpg, map[string]*bintree{}},
"18.jpg": &bintree{testdataBenchmark18Jpg, map[string]*bintree{}},
"19.jpg": &bintree{testdataBenchmark19Jpg, map[string]*bintree{}},
"2.jpg": &bintree{testdataBenchmark2Jpg, map[string]*bintree{}},
"20.jpg": &bintree{testdataBenchmark20Jpg, map[string]*bintree{}},
"21.jpg": &bintree{testdataBenchmark21Jpg, map[string]*bintree{}},
"22.jpg": &bintree{testdataBenchmark22Jpg, map[string]*bintree{}},
"23.jpg": &bintree{testdataBenchmark23Jpg, map[string]*bintree{}},
"24.jpg": &bintree{testdataBenchmark24Jpg, map[string]*bintree{}},
"25.jpg": &bintree{testdataBenchmark25Jpg, map[string]*bintree{}},
"26.jpg": &bintree{testdataBenchmark26Jpg, map[string]*bintree{}},
"27.jpg": &bintree{testdataBenchmark27Jpg, map[string]*bintree{}},
"28.jpg": &bintree{testdataBenchmark28Jpg, map[string]*bintree{}},
"29.jpg": &bintree{testdataBenchmark29Jpg, map[string]*bintree{}},
"3.jpg": &bintree{testdataBenchmark3Jpg, map[string]*bintree{}},
"30.jpg": &bintree{testdataBenchmark30Jpg, map[string]*bintree{}},
"31.jpg": &bintree{testdataBenchmark31Jpg, map[string]*bintree{}},
"32.jpg": &bintree{testdataBenchmark32Jpg, map[string]*bintree{}},
"33.jpg": &bintree{testdataBenchmark33Jpg, map[string]*bintree{}},
"34.jpg": &bintree{testdataBenchmark34Jpg, map[string]*bintree{}},
"35.jpg": &bintree{testdataBenchmark35Jpg, map[string]*bintree{}},
"36.jpg": &bintree{testdataBenchmark36Jpg, map[string]*bintree{}},
"37.jpg": &bintree{testdataBenchmark37Jpg, map[string]*bintree{}},
"38.jpg": &bintree{testdataBenchmark38Jpg, map[string]*bintree{}},
"39.jpg": &bintree{testdataBenchmark39Jpg, map[string]*bintree{}},
"4.jpg": &bintree{testdataBenchmark4Jpg, map[string]*bintree{}},
"40.jpg": &bintree{testdataBenchmark40Jpg, map[string]*bintree{}},
"41.jpg": &bintree{testdataBenchmark41Jpg, map[string]*bintree{}},
"42.jpg": &bintree{testdataBenchmark42Jpg, map[string]*bintree{}},
"43.jpg": &bintree{testdataBenchmark43Jpg, map[string]*bintree{}},
"44.jpg": &bintree{testdataBenchmark44Jpg, map[string]*bintree{}},
"45.jpg": &bintree{testdataBenchmark45Jpg, map[string]*bintree{}},
"46.jpg": &bintree{testdataBenchmark46Jpg, map[string]*bintree{}},
"47.jpg": &bintree{testdataBenchmark47Jpg, map[string]*bintree{}},
"48.jpg": &bintree{testdataBenchmark48Jpg, map[string]*bintree{}},
"49.jpg": &bintree{testdataBenchmark49Jpg, map[string]*bintree{}},
"5.jpg": &bintree{testdataBenchmark5Jpg, map[string]*bintree{}},
"6.jpg": &bintree{testdataBenchmark6Jpg, map[string]*bintree{}},
"7.jpg": &bintree{testdataBenchmark7Jpg, map[string]*bintree{}},
"8.jpg": &bintree{testdataBenchmark8Jpg, map[string]*bintree{}},
"9.jpg": &bintree{testdataBenchmark9Jpg, map[string]*bintree{}},
"testdata": {nil, map[string]*bintree{
"benchmark": {nil, map[string]*bintree{
"0.jpg": {testdataBenchmark0Jpg, map[string]*bintree{}},
"1.jpg": {testdataBenchmark1Jpg, map[string]*bintree{}},
"10.jpg": {testdataBenchmark10Jpg, map[string]*bintree{}},
"11.jpg": {testdataBenchmark11Jpg, map[string]*bintree{}},
"12.jpg": {testdataBenchmark12Jpg, map[string]*bintree{}},
"13.jpg": {testdataBenchmark13Jpg, map[string]*bintree{}},
"14.jpg": {testdataBenchmark14Jpg, map[string]*bintree{}},
"15.jpg": {testdataBenchmark15Jpg, map[string]*bintree{}},
"16.jpg": {testdataBenchmark16Jpg, map[string]*bintree{}},
"17.jpg": {testdataBenchmark17Jpg, map[string]*bintree{}},
"18.jpg": {testdataBenchmark18Jpg, map[string]*bintree{}},
"19.jpg": {testdataBenchmark19Jpg, map[string]*bintree{}},
"2.jpg": {testdataBenchmark2Jpg, map[string]*bintree{}},
"20.jpg": {testdataBenchmark20Jpg, map[string]*bintree{}},
"21.jpg": {testdataBenchmark21Jpg, map[string]*bintree{}},
"22.jpg": {testdataBenchmark22Jpg, map[string]*bintree{}},
"23.jpg": {testdataBenchmark23Jpg, map[string]*bintree{}},
"24.jpg": {testdataBenchmark24Jpg, map[string]*bintree{}},
"25.jpg": {testdataBenchmark25Jpg, map[string]*bintree{}},
"26.jpg": {testdataBenchmark26Jpg, map[string]*bintree{}},
"27.jpg": {testdataBenchmark27Jpg, map[string]*bintree{}},
"28.jpg": {testdataBenchmark28Jpg, map[string]*bintree{}},
"29.jpg": {testdataBenchmark29Jpg, map[string]*bintree{}},
"3.jpg": {testdataBenchmark3Jpg, map[string]*bintree{}},
"30.jpg": {testdataBenchmark30Jpg, map[string]*bintree{}},
"31.jpg": {testdataBenchmark31Jpg, map[string]*bintree{}},
"32.jpg": {testdataBenchmark32Jpg, map[string]*bintree{}},
"33.jpg": {testdataBenchmark33Jpg, map[string]*bintree{}},
"34.jpg": {testdataBenchmark34Jpg, map[string]*bintree{}},
"35.jpg": {testdataBenchmark35Jpg, map[string]*bintree{}},
"36.jpg": {testdataBenchmark36Jpg, map[string]*bintree{}},
"37.jpg": {testdataBenchmark37Jpg, map[string]*bintree{}},
"38.jpg": {testdataBenchmark38Jpg, map[string]*bintree{}},
"39.jpg": {testdataBenchmark39Jpg, map[string]*bintree{}},
"4.jpg": {testdataBenchmark4Jpg, map[string]*bintree{}},
"40.jpg": {testdataBenchmark40Jpg, map[string]*bintree{}},
"41.jpg": {testdataBenchmark41Jpg, map[string]*bintree{}},
"42.jpg": {testdataBenchmark42Jpg, map[string]*bintree{}},
"43.jpg": {testdataBenchmark43Jpg, map[string]*bintree{}},
"44.jpg": {testdataBenchmark44Jpg, map[string]*bintree{}},
"45.jpg": {testdataBenchmark45Jpg, map[string]*bintree{}},
"46.jpg": {testdataBenchmark46Jpg, map[string]*bintree{}},
"47.jpg": {testdataBenchmark47Jpg, map[string]*bintree{}},
"48.jpg": {testdataBenchmark48Jpg, map[string]*bintree{}},
"49.jpg": {testdataBenchmark49Jpg, map[string]*bintree{}},
"5.jpg": {testdataBenchmark5Jpg, map[string]*bintree{}},
"6.jpg": {testdataBenchmark6Jpg, map[string]*bintree{}},
"7.jpg": {testdataBenchmark7Jpg, map[string]*bintree{}},
"8.jpg": {testdataBenchmark8Jpg, map[string]*bintree{}},
"9.jpg": {testdataBenchmark9Jpg, map[string]*bintree{}},
}},
}},
}}
Expand Down
16 changes: 8 additions & 8 deletions testdata/out/compress-memcopy.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions testdata/out/compress-nomemcopy.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions testdata/out/debug.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions testdata/out/nocompress-memcopy.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions testdata/out/nocompress-nomemcopy.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 8 additions & 12 deletions toc.go
View file
Expand Up @@ -57,7 +57,11 @@ func (root *assetTree) funcOrNil() string {

func (root *assetTree) writeGoMap(buf *bytes.Buffer, nident int) {
buf.Grow(35) // at least this size
fmt.Fprintf(buf, "&bintree{%s, map[string]*bintree{", root.funcOrNil())
if nident == 0 {
// at the top level we need to declare the map type
buf.WriteString("&bintree")
}
fmt.Fprintf(buf, "{%s, map[string]*bintree{", root.funcOrNil())

if len(root.Children) > 0 {
buf.WriteByte('\n')
Expand Down Expand Up @@ -100,11 +104,7 @@ var _bintree = `))
}
buf := new(bytes.Buffer)
root.writeGoMap(buf, 0)
fmted, err := format.Source(buf.Bytes())
if err != nil {
return err
}
_, writeErr := w.Write(fmted)
_, writeErr := w.Write(buf.Bytes())
return writeErr
}

Expand Down Expand Up @@ -277,11 +277,7 @@ func AssetNames() []string {
`)
}

type stringWriter interface {
WriteString(s string) (int, error)
}

func writeTOCMapHeader(w stringWriter) error {
func writeTOCMapHeader(w io.StringWriter) error {
_, err := w.WriteString(`
// _bindata is a table, holding each asset generator, mapped to its name.
var _bindata = map[string]func() (*asset, error){
Expand All @@ -296,7 +292,7 @@ func writeTOCAsset(w io.Writer, asset *Asset) error {
}

// writeTOCFooter writes the table of contents file footer.
func writeTOCFooter(w stringWriter) {
func writeTOCFooter(w io.StringWriter) {
w.WriteString(`}
`)
Expand Down

0 comments on commit d86eec4

Please sign in to comment.