mirror of
https://github.com/go-gitea/gitea
synced 2025-07-22 10:18:38 +00:00
format with gofumpt (#18184)
* gofumpt -w -l . * gofumpt -w -l -extra . * Add linter * manual fix * change make fmt
This commit is contained in:
@@ -18,9 +18,7 @@ import (
|
||||
"code.gitea.io/gitea/modules/util"
|
||||
)
|
||||
|
||||
var (
|
||||
directories = make(directorySet)
|
||||
)
|
||||
var directories = make(directorySet)
|
||||
|
||||
// Dir returns all files from bindata or custom directory.
|
||||
func Dir(name string) ([]string, error) {
|
||||
@@ -28,9 +26,7 @@ func Dir(name string) ([]string, error) {
|
||||
return directories.Get(name), nil
|
||||
}
|
||||
|
||||
var (
|
||||
result []string
|
||||
)
|
||||
var result []string
|
||||
|
||||
customDir := path.Join(setting.CustomPath, "options", name)
|
||||
isDir, err := util.IsDir(customDir)
|
||||
@@ -39,7 +35,6 @@ func Dir(name string) ([]string, error) {
|
||||
}
|
||||
if isDir {
|
||||
files, err := util.StatDir(customDir, true)
|
||||
|
||||
if err != nil {
|
||||
return []string{}, fmt.Errorf("Failed to read custom directory. %v", err)
|
||||
}
|
||||
@@ -48,7 +43,6 @@ func Dir(name string) ([]string, error) {
|
||||
}
|
||||
|
||||
files, err := AssetDir(name)
|
||||
|
||||
if err != nil {
|
||||
return []string{}, fmt.Errorf("Failed to read embedded directory. %v", err)
|
||||
}
|
||||
@@ -69,7 +63,7 @@ func AssetDir(dirName string) ([]string, error) {
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
var results = make([]string, 0, len(files))
|
||||
results := make([]string, 0, len(files))
|
||||
for _, file := range files {
|
||||
results = append(results, file.Name())
|
||||
}
|
||||
@@ -133,7 +127,7 @@ func Asset(name string) ([]byte, error) {
|
||||
|
||||
func AssetNames() []string {
|
||||
realFS := Assets.(vfsgen۰FS)
|
||||
var results = make([]string, 0, len(realFS))
|
||||
results := make([]string, 0, len(realFS))
|
||||
for k := range realFS {
|
||||
results = append(results, k[1:])
|
||||
}
|
||||
|
Reference in New Issue
Block a user