ref: a91bcd85e2d2b11e7bc8463d05e019de54abe3cf
parent: e007c9b25d076f5705afb63fda4f3abd3d05b7b8
author: bep <[email protected]>
date: Sat Mar 7 07:58:39 EST 2015
source: apply some Golint rules
--- a/source/file.go
+++ b/source/file.go
@@ -53,19 +53,17 @@
func (f *File) Section() string { if f.section != "" {return f.section
- } else {- f.section = helpers.GuessSection(f.Dir())
- return f.section
}
+ f.section = helpers.GuessSection(f.Dir())
+ return f.section
}
func (f *File) LogicalName() string { if f.logicalName != "" {return f.logicalName
- } else {- _, f.logicalName = filepath.Split(f.relpath)
- return f.logicalName
}
+ _, f.logicalName = filepath.Split(f.relpath)
+ return f.logicalName
}
func (f *File) SetDir(dir string) {@@ -75,19 +73,17 @@
func (f *File) Dir() string { if f.dir != "" {return f.dir
- } else {- f.dir, _ = filepath.Split(f.relpath)
- return f.dir
}
+ f.dir, _ = filepath.Split(f.relpath)
+ return f.dir
}
func (f *File) Extension() string { if f.ext != "" {return f.ext
- } else {- f.ext = strings.TrimPrefix(filepath.Ext(f.LogicalName()), ".")
- return f.ext
}
+ f.ext = strings.TrimPrefix(filepath.Ext(f.LogicalName()), ".")
+ return f.ext
}
func (f *File) Ext() string {--- a/source/filesystem.go
+++ b/source/filesystem.go
@@ -107,17 +107,17 @@
return filepath.SkipDir
}
return nil
- } else {- if isNonProcessablePath(filePath) {- return nil
- }
- data, err := ioutil.ReadFile(filePath)
- if err != nil {- return err
- }
- f.add(filePath, bytes.NewBuffer(data))
+ }
+
+ if isNonProcessablePath(filePath) {return nil
}
+ data, err := ioutil.ReadFile(filePath)
+ if err != nil {+ return err
+ }
+ f.add(filePath, bytes.NewBuffer(data))
+ return nil
}
filepath.Walk(f.Base, walker)