Skip to content

Commit

Permalink
toc: format the bintree map also
Browse files Browse the repository at this point in the history
This also gets formatted in Go 1.20, so we need to make sure we run it
through go/format to avoid unnecessary diffs.
  • Loading branch information
kevinburke committed Mar 21, 2023
1 parent bba30ab commit 6088527
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 17 deletions.
32 changes: 17 additions & 15 deletions testdata/assets/bindata.go
Original file line number Diff line number Diff line change
Expand Up @@ -1267,11 +1267,13 @@ const AssetDebug = false
// directory embedded in the file by go-bindata.
// For example if you run go-bindata on data/... and data contains the
// following hierarchy:
// data/
// foo.txt
// img/
// a.png
// b.png
//
// data/
// foo.txt
// img/
// a.png
// b.png
//
// then AssetDir("data") would return []string{"foo.txt", "img"},
// AssetDir("data/img") would return []string{"a.png", "b.png"},
// AssetDir("foo.txt") and AssetDir("notexist") would return an error, and
Expand Down Expand Up @@ -1306,8 +1308,8 @@ type bintree struct {
var _bintree = &bintree{nil, 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{}},
"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{}},
Expand All @@ -1318,7 +1320,7 @@ var _bintree = &bintree{nil, 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{}},
"2.jpg": {testdataBenchmark2Jpg, map[string]*bintree{}},
"20.jpg": {testdataBenchmark20Jpg, map[string]*bintree{}},
"21.jpg": {testdataBenchmark21Jpg, map[string]*bintree{}},
"22.jpg": {testdataBenchmark22Jpg, map[string]*bintree{}},
Expand All @@ -1329,7 +1331,7 @@ var _bintree = &bintree{nil, 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{}},
"3.jpg": {testdataBenchmark3Jpg, map[string]*bintree{}},
"30.jpg": {testdataBenchmark30Jpg, map[string]*bintree{}},
"31.jpg": {testdataBenchmark31Jpg, map[string]*bintree{}},
"32.jpg": {testdataBenchmark32Jpg, map[string]*bintree{}},
Expand All @@ -1340,7 +1342,7 @@ var _bintree = &bintree{nil, 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{}},
"4.jpg": {testdataBenchmark4Jpg, map[string]*bintree{}},
"40.jpg": {testdataBenchmark40Jpg, map[string]*bintree{}},
"41.jpg": {testdataBenchmark41Jpg, map[string]*bintree{}},
"42.jpg": {testdataBenchmark42Jpg, map[string]*bintree{}},
Expand All @@ -1351,11 +1353,11 @@ var _bintree = &bintree{nil, 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{}},
"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
13 changes: 11 additions & 2 deletions toc.go
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,8 @@ var _bintree = `))
}

func writeTOCTree(w io.Writer, toc []Asset) error {
_, err := w.Write([]byte(`// AssetDir returns the file names below a certain
innerBuf := new(strings.Builder)
_, err := innerBuf.Write([]byte(`// AssetDir returns the file names below a certain
// directory embedded in the file by go-bindata.
// For example if you run go-bindata on data/... and data contains the
// following hierarchy:
Expand Down Expand Up @@ -155,7 +156,15 @@ func AssetDir(name string) ([]string, error) {
pathList := strings.Split(toc[i].Name, "/")
tree.Add(pathList, toc[i])
}
return tree.WriteAsGoMap(w)
if err := tree.WriteAsGoMap(innerBuf); err != nil {
return err
}
fmted, err := format.Source([]byte(innerBuf.String()))
if err != nil {
return err
}
_, err = w.Write(fmted)
return err
}

// writeTOC writes the table of contents file.
Expand Down

0 comments on commit 6088527

Please sign in to comment.