build: modernize with "go fix -slicesbackward": use slices.Backward

This commit is contained in:
Nick Craig-Wood
2026-08-21 12:23:31 +01:00
parent e20e18d2e0
commit 237719bb8d
5 changed files with 11 additions and 12 deletions
+4 -4
View File
@@ -17,6 +17,7 @@ import (
"path" "path"
"path/filepath" "path/filepath"
"runtime" "runtime"
"slices"
"sort" "sort"
"strconv" "strconv"
"strings" "strings"
@@ -1569,8 +1570,7 @@ func Rmdirs(ctx context.Context, f fs.Fs, dir string, leaveRoot bool) error {
errCount := errcount.New() errCount := errcount.New()
// Delete all directories at the same level in parallel // Delete all directories at the same level in parallel
for level := len(toDelete) - 1; level >= 0; level-- { for level, dirs := range slices.Backward(toDelete) {
dirs := toDelete[level]
if len(dirs) == 0 { if len(dirs) == 0 {
continue continue
} }
@@ -2511,8 +2511,8 @@ func DirMove(ctx context.Context, f fs.Fs, srcRemote, dstRemote string) (err err
} }
// Remove the source directories in reverse order // Remove the source directories in reverse order
for i := len(dirs) - 1; i >= 0; i-- { for _, dir := range slices.Backward(dirs) {
err := f.Rmdir(ctx, dirs[i]) err := f.Rmdir(ctx, dir)
if err != nil { if err != nil {
return fmt.Errorf("RenameDir rmdir: %w", err) return fmt.Errorf("RenameDir rmdir: %w", err)
} }
+1 -2
View File
@@ -684,8 +684,7 @@ func (s *syncCopyMove) deleteEmptyDirectories(ctx context.Context, f fs.Fs, entr
sort.Sort(entries) sort.Sort(entries)
var errorCount int var errorCount int
var okCount int var okCount int
for i := len(entries) - 1; i >= 0; i-- { for _, entry := range slices.Backward(entries) {
entry := entries[i]
dir, ok := entry.(fs.Directory) dir, ok := entry.(fs.Directory)
if ok { if ok {
// TryRmdir only deletes empty directories // TryRmdir only deletes empty directories
+2 -2
View File
@@ -11,6 +11,7 @@ import (
"os" "os"
"os/exec" "os/exec"
"runtime" "runtime"
"slices"
"sort" "sort"
"strings" "strings"
"testing" "testing"
@@ -564,8 +565,7 @@ func TestSyncSetDelayedModTimes(t *testing.T) {
// Timestamp the directories in reverse order // Timestamp the directories in reverse order
ts := t1 ts := t1
for i := len(dirs) - 1; i >= 0; i-- { for _, dir := range slices.Backward(dirs) {
dir := dirs[i]
_, err := operations.SetDirModTime(ctx, r.Flocal, nil, dir, ts) _, err := operations.SetDirModTime(ctx, r.Flocal, nil, dir, ts)
require.NoError(t, err) require.NoError(t, err)
ts = ts.Add(time.Minute) ts = ts.Add(time.Minute)
+2 -2
View File
@@ -15,6 +15,7 @@ import (
"path/filepath" "path/filepath"
"regexp" "regexp"
"runtime" "runtime"
"slices"
"sort" "sort"
"strings" "strings"
"testing" "testing"
@@ -515,8 +516,7 @@ func Purge(f fs.Fs) {
return nil return nil
}) })
sort.Strings(dirs) sort.Strings(dirs)
for i := len(dirs) - 1; i >= 0; i-- { for _, dir := range slices.Backward(dirs) {
dir := dirs[i]
fs.Debugf(f, "Purge dir %q", dir) fs.Debugf(f, "Purge dir %q", dir)
err := f.Rmdir(ctx, dir) err := f.Rmdir(ctx, dir)
if err != nil { if err != nil {
+2 -2
View File
@@ -33,6 +33,7 @@ import (
"os" "os"
"path" "path"
"path/filepath" "path/filepath"
"slices"
"sort" "sort"
"testing" "testing"
"time" "time"
@@ -181,8 +182,7 @@ func newRunIndividual(t *testing.T, individual bool) *Run {
} }
require.NoError(t, err) require.NoError(t, err)
sort.Strings(toDelete) sort.Strings(toDelete)
for i := len(toDelete) - 1; i >= 0; i-- { for _, dir := range slices.Backward(toDelete) {
dir := toDelete[i]
_ = Retry(t, fmt.Sprintf("removing dir %q", dir), func() error { _ = Retry(t, fmt.Sprintf("removing dir %q", dir), func() error {
return r.Fremote.Rmdir(ctx, dir) return r.Fremote.Rmdir(ctx, dir)
}) })