Merge branch 'main' into v2

* main:
  build: use specific token for pushing release tags
  fix(gui): update `uncamel()` to handle strings like 'IDs' (fixes #10128) (#10131)
  refactor: use slices package for sort (#10132)
  build: process for automatic release tags (#10133)
  chore(gui, man, authors): update docs, translations, and contributors
This commit is contained in:
Jakob Borg
2025-05-26 14:22:30 +02:00
51 changed files with 375 additions and 115 deletions
+6 -7
View File
@@ -12,7 +12,7 @@ import (
"fmt"
"os"
"path/filepath"
"sort"
"slices"
"strconv"
"strings"
"syscall"
@@ -218,7 +218,7 @@ func TestDirNames(t *testing.T) {
"a",
"bC",
}
sort.Strings(testCases)
slices.Sort(testCases)
for _, sub := range testCases {
if err := os.Mkdir(filepath.Join(dir, sub), 0o777); err != nil {
@@ -229,7 +229,7 @@ func TestDirNames(t *testing.T) {
if dirs, err := fs.DirNames("."); err != nil || len(dirs) != len(testCases) {
t.Errorf("%s %s %s", err, dirs, testCases)
} else {
sort.Strings(dirs)
slices.Sort(dirs)
for i := range dirs {
if dirs[i] != testCases[i] {
t.Errorf("%s != %s", dirs[i], testCases[i])
@@ -321,8 +321,8 @@ func TestGlob(t *testing.T) {
for _, testCase := range testCases {
results, err := fs.Glob(testCase.pattern)
sort.Strings(results)
sort.Strings(testCase.matches)
slices.Sort(results)
slices.Sort(testCase.matches)
if err != nil {
t.Error(err)
}
@@ -628,8 +628,7 @@ func TestXattr(t *testing.T) {
Value: value,
})
}
sort.Slice(attrs, func(i, j int) bool { return attrs[i].Name < attrs[j].Name })
slices.SortFunc(attrs, func(a, b protocol.Xattr) int { return strings.Compare(a.Name, b.Name) })
// Set the xattrs, read them back and compare
if err := tfs.SetXattr("/test", attrs, testXattrFilter{}); err != nil {
t.Fatal(err)
+2 -2
View File
@@ -12,7 +12,7 @@ package fs
import (
"errors"
"fmt"
"sort"
"slices"
"unsafe"
"golang.org/x/sys/unix"
@@ -69,7 +69,7 @@ func listXattr(path string) ([]string, error) {
}
}
sort.Strings(attrs)
slices.Sort(attrs)
return attrs, nil
}
+2 -2
View File
@@ -12,7 +12,7 @@ package fs
import (
"errors"
"fmt"
"sort"
"slices"
"strings"
"golang.org/x/sys/unix"
@@ -38,6 +38,6 @@ func listXattr(path string) ([]string, error) {
buf = buf[:size]
attrs := compact(strings.Split(string(buf), "\x00"))
sort.Strings(attrs)
slices.Sort(attrs)
return attrs, nil
}
+2 -2
View File
@@ -11,7 +11,7 @@ import (
"fmt"
"path/filepath"
"runtime"
"sort"
"slices"
"strings"
"testing"
"time"
@@ -344,7 +344,7 @@ func fakefsForBenchmark(nfiles int, latency time.Duration) (Filesystem, []string
return nil, nil, errors.New("didn't find enough stuff")
}
sort.Strings(paths)
slices.Sort(paths)
return fsys, paths, nil
}
+3 -3
View File
@@ -14,7 +14,7 @@ import (
"path"
"path/filepath"
"runtime"
"sort"
"slices"
"testing"
"time"
@@ -369,8 +369,8 @@ func assertDir(t *testing.T, fs Filesystem, directory string, filenames []string
if path.Clean(directory) == "/" {
filenames = append(filenames, ".stfolder")
}
sort.Strings(filenames)
sort.Strings(got)
slices.Sort(filenames)
slices.Sort(got)
if len(filenames) != len(got) {
t.Errorf("want %s, got %s", filenames, got)