Skip to content

B
beego
Commit f193e313 authored by Viktor Vassilyev's avatar Viktor Vassilyev
Browse files
Options

refactor(FileSystem): using single-line if

parent 9ac49281
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
fs.go
View file @ f193e313
...@@ -41,8 +41,7 @@ func walk(fs http.FileSystem, path string, info os.FileInfo, walkFn filepath.Wal ...@@ -41,8 +41,7 @@ func walk(fs http.FileSystem, path string, info os.FileInfo, walkFn filepath.Wal
dir, err := fs.Open(path) dir, err := fs.Open(path)
defer dir.Close() defer dir.Close()
if err != nil { if err != nil {
err1 := walkFn(path, info, err) if err1 := walkFn(path, info, err); err1 != nil {
if err1 != nil {
return err1 return err1
} }
return err return err
...@@ -62,8 +61,7 @@ func walk(fs http.FileSystem, path string, info os.FileInfo, walkFn filepath.Wal ...@@ -62,8 +61,7 @@ func walk(fs http.FileSystem, path string, info os.FileInfo, walkFn filepath.Wal
for _, fileInfo := range dirs { for _, fileInfo := range dirs {
filename := filepath.Join(path, fileInfo.Name()) filename := filepath.Join(path, fileInfo.Name())
err = walk(fs, filename, fileInfo, walkFn) if err = walk(fs, filename, fileInfo, walkFn); err != nil {
if err != nil {
if !fileInfo.IsDir() || err != filepath.SkipDir { if !fileInfo.IsDir() || err != filepath.SkipDir {
return err return err
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment