style: gofumpt all the things (#9829)
Literally `gofumpt -w .` from the top level dir. Guaranteed to be minor style changes only and nothing else. @imsodin per request?
This commit is contained in:
@@ -10,6 +10,4 @@ import (
|
||||
"github.com/syncthing/syncthing/lib/logger"
|
||||
)
|
||||
|
||||
var (
|
||||
l = logger.DefaultLogger.NewFacility("versioner", "File versioning")
|
||||
)
|
||||
var l = logger.DefaultLogger.NewFacility("versioner", "File versioning")
|
||||
|
||||
@@ -27,7 +27,7 @@ import (
|
||||
// └── remove21
|
||||
// └── remove22
|
||||
func TestEmptyDirs(t *testing.T) {
|
||||
var paths = []struct {
|
||||
paths := []struct {
|
||||
path string
|
||||
isFile bool
|
||||
}{
|
||||
@@ -44,7 +44,7 @@ func TestEmptyDirs(t *testing.T) {
|
||||
{"remove2/remove21/remove22", false},
|
||||
}
|
||||
|
||||
var expected = []string{
|
||||
expected := []string{
|
||||
"remove2/remove21/remove22",
|
||||
"remove2/remove21",
|
||||
"remove2",
|
||||
|
||||
@@ -81,10 +81,10 @@ func prepForRemoval(t *testing.T, file string) {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
if err := os.MkdirAll(filepath.Dir(file), 0755); err != nil {
|
||||
if err := os.MkdirAll(filepath.Dir(file), 0o755); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := os.WriteFile(file, []byte("hello\n"), 0644); err != nil {
|
||||
if err := os.WriteFile(file, []byte("hello\n"), 0o644); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -30,7 +30,7 @@ type simple struct {
|
||||
}
|
||||
|
||||
func newSimple(cfg config.FolderConfiguration) Versioner {
|
||||
var keep, err = strconv.Atoi(cfg.Versioning.Params["keep"])
|
||||
keep, err := strconv.Atoi(cfg.Versioning.Params["keep"])
|
||||
cleanoutDays, _ := strconv.Atoi(cfg.Versioning.Params["cleanoutDays"])
|
||||
// On error we default to 0, "do not clean out the versioned items"
|
||||
|
||||
|
||||
@@ -134,7 +134,7 @@ func TestCreateVersionPath(t *testing.T) {
|
||||
|
||||
// Create a test dir and file
|
||||
tmpDir := t.TempDir()
|
||||
if err := os.WriteFile(filepath.Join(tmpDir, archiveFile), []byte("sup"), 0644); err != nil {
|
||||
if err := os.WriteFile(filepath.Join(tmpDir, archiveFile), []byte("sup"), 0o644); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
|
||||
@@ -182,7 +182,7 @@ func readFile(t *testing.T, filesystem fs.Filesystem, name string) string {
|
||||
}
|
||||
|
||||
func writeFile(t *testing.T, filesystem fs.Filesystem, name, content string) {
|
||||
fd, err := filesystem.OpenFile(name, fs.OptReadWrite|fs.OptCreate, 0777)
|
||||
fd, err := filesystem.OpenFile(name, fs.OptReadWrite|fs.OptCreate, 0o777)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
@@ -213,7 +213,7 @@ func TestTrashcanCleanOut(t *testing.T) {
|
||||
|
||||
v := newTrashcan(cfg)
|
||||
|
||||
var testcases = map[string]bool{
|
||||
testcases := map[string]bool{
|
||||
".stversions/file1": false,
|
||||
".stversions/file2": true,
|
||||
".stversions/keep1/file1": false,
|
||||
@@ -229,7 +229,7 @@ func TestTrashcanCleanOut(t *testing.T) {
|
||||
t.Run("trashcan versioner trashcan clean up", func(t *testing.T) {
|
||||
oldTime := time.Now().Add(-8 * 24 * time.Hour)
|
||||
for file, shouldRemove := range testcases {
|
||||
fs.MkdirAll(filepath.Dir(file), 0777)
|
||||
fs.MkdirAll(filepath.Dir(file), 0o777)
|
||||
|
||||
writeFile(t, fs, file, "some content")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user