luckyimnotanigger/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-05-31 20:02:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

format with gofumpt (#18184)

Browse source 
* gofumpt -w -l .

* gofumpt -w -l -extra .

* Add linter

* manual fix

* change make fmt
This commit is contained in:
6543 2022-01-20 18:46:10 +01:00 • committed by GitHub
parent 1d98d205f5
commit 54e9ee37a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
423 changed files with 1585 additions and 1758 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/options/dynamic.go
View file

@ -17,9 +17,7 @@ import (
"code.gitea.io/gitea/modules/util"
)
var (
directories = make(directorySet)
)
var directories = make(directorySet)
// Dir returns all files from static or custom directory.
func Dir(name string) ([]string, error) {
@ -27,9 +25,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)
@ -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)
}
@ -55,7 +50,6 @@ func Dir(name string) ([]string, error) {
}
if isDir {
files, err := util.StatDir(staticDir, true)
if err != nil {
return []string{}, fmt.Errorf("Failed to read static directory. %v", err)
}

14
modules/options/static.go
View file

@ -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:])
}