Skip to content
This repository was archived by the owner on Sep 19, 2018. It is now read-only.

Commit 8ed2cd0

Browse files
committed
Fix go format of generated code
The following changes make the generated code go fmt compatible.
1 parent bfe36d3 commit 8ed2cd0

9 files changed

+347
-362
lines changed

debug.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ func writeDebugHeader(w io.Writer) error {
3232
_, err := fmt.Fprintf(w, `import (
3333
"fmt"
3434
"io/ioutil"
35-
"strings"
3635
"os"
3736
"path/filepath"
37+
"strings"
3838
)
3939
4040
// bindataRead reads the given file from disk. It returns an error on failure.

release.go

+17-17
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,11 @@ func header_compressed_nomemcopy(w io.Writer) error {
103103
"compress/gzip"
104104
"fmt"
105105
"io"
106-
"strings"
107-
"os"
108-
"time"
109106
"io/ioutil"
107+
"os"
110108
"path/filepath"
109+
"strings"
110+
"time"
111111
)
112112
113113
func bindataRead(data, name string) ([]byte, error) {
@@ -140,11 +140,11 @@ func header_compressed_memcopy(w io.Writer) error {
140140
"compress/gzip"
141141
"fmt"
142142
"io"
143-
"strings"
144-
"os"
145-
"time"
146143
"io/ioutil"
144+
"os"
147145
"path/filepath"
146+
"strings"
147+
"time"
148148
)
149149
150150
func bindataRead(data []byte, name string) ([]byte, error) {
@@ -174,13 +174,13 @@ func bindataRead(data []byte, name string) ([]byte, error) {
174174
func header_uncompressed_nomemcopy(w io.Writer) error {
175175
_, err := fmt.Fprintf(w, `import (
176176
"fmt"
177+
"io/ioutil"
178+
"os"
179+
"path/filepath"
177180
"reflect"
178181
"strings"
179-
"unsafe"
180-
"os"
181182
"time"
182-
"io/ioutil"
183-
"path/filepath"
183+
"unsafe"
184184
)
185185
186186
func bindataRead(data, name string) ([]byte, error) {
@@ -201,11 +201,11 @@ func bindataRead(data, name string) ([]byte, error) {
201201
func header_uncompressed_memcopy(w io.Writer) error {
202202
_, err := fmt.Fprintf(w, `import (
203203
"fmt"
204-
"strings"
205-
"os"
206-
"time"
207204
"io/ioutil"
205+
"os"
208206
"path/filepath"
207+
"strings"
208+
"time"
209209
)
210210
`)
211211
return err
@@ -218,9 +218,9 @@ func header_release_common(w io.Writer) error {
218218
}
219219
220220
type bindataFileInfo struct {
221-
name string
222-
size int64
223-
mode os.FileMode
221+
name string
222+
size int64
223+
mode os.FileMode
224224
modTime time.Time
225225
}
226226
@@ -378,7 +378,7 @@ func asset_release_common(w io.Writer, c *Config, asset *Asset) error {
378378
}
379379
380380
info := bindataFileInfo{name: %q, size: %d, mode: os.FileMode(%d), modTime: time.Unix(%d, 0)}
381-
a := &asset{bytes: bytes, info: info}
381+
a := &asset{bytes: bytes, info: info}
382382
return a, nil
383383
}
384384

restore.go

+36-36
Original file line numberDiff line numberDiff line change
@@ -13,49 +13,49 @@ func writeRestore(w io.Writer) error {
1313
_, err := fmt.Fprintf(w, `
1414
// RestoreAsset restores an asset under the given directory
1515
func RestoreAsset(dir, name string) error {
16-
data, err := Asset(name)
17-
if err != nil {
18-
return err
19-
}
20-
info, err := AssetInfo(name)
21-
if err != nil {
22-
return err
23-
}
24-
err = os.MkdirAll(_filePath(dir, filepath.Dir(name)), os.FileMode(0755))
25-
if err != nil {
26-
return err
27-
}
28-
err = ioutil.WriteFile(_filePath(dir, name), data, info.Mode())
29-
if err != nil {
30-
return err
31-
}
32-
err = os.Chtimes(_filePath(dir, name), info.ModTime(), info.ModTime())
33-
if err != nil {
34-
return err
35-
}
36-
return nil
16+
data, err := Asset(name)
17+
if err != nil {
18+
return err
19+
}
20+
info, err := AssetInfo(name)
21+
if err != nil {
22+
return err
23+
}
24+
err = os.MkdirAll(_filePath(dir, filepath.Dir(name)), os.FileMode(0755))
25+
if err != nil {
26+
return err
27+
}
28+
err = ioutil.WriteFile(_filePath(dir, name), data, info.Mode())
29+
if err != nil {
30+
return err
31+
}
32+
err = os.Chtimes(_filePath(dir, name), info.ModTime(), info.ModTime())
33+
if err != nil {
34+
return err
35+
}
36+
return nil
3737
}
3838
3939
// RestoreAssets restores an asset under the given directory recursively
4040
func RestoreAssets(dir, name string) error {
41-
children, err := AssetDir(name)
42-
// File
43-
if err != nil {
44-
return RestoreAsset(dir, name)
45-
}
46-
// Dir
47-
for _, child := range children {
48-
err = RestoreAssets(dir, filepath.Join(name, child))
49-
if err != nil {
50-
return err
51-
}
52-
}
53-
return nil
41+
children, err := AssetDir(name)
42+
// File
43+
if err != nil {
44+
return RestoreAsset(dir, name)
45+
}
46+
// Dir
47+
for _, child := range children {
48+
err = RestoreAssets(dir, filepath.Join(name, child))
49+
if err != nil {
50+
return err
51+
}
52+
}
53+
return nil
5454
}
5555
5656
func _filePath(dir, name string) string {
57-
cannonicalName := strings.Replace(name, "\\", "/", -1)
58-
return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...)
57+
cannonicalName := strings.Replace(name, "\\", "/", -1)
58+
return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...)
5959
}
6060
6161
`)

testdata/out/compress-memcopy.go

+56-60
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)