diff --git a/internal/backend/layout_test.go b/internal/backend/layout_test.go index 0c52b32bc..09b6e80c2 100644 --- a/internal/backend/layout_test.go +++ b/internal/backend/layout_test.go @@ -116,8 +116,8 @@ func TestDefaultLayout(t *testing.T) { want = append(want, filepath.Join(tempdir, "data", fmt.Sprintf("%02x", i))) } - sort.Sort(sort.StringSlice(want)) - sort.Sort(sort.StringSlice(dirs)) + sort.Strings(want) + sort.Strings(dirs) if !reflect.DeepEqual(dirs, want) { t.Fatalf("wrong paths returned, want:\n %v\ngot:\n %v", want, dirs) @@ -189,8 +189,8 @@ func TestRESTLayout(t *testing.T) { filepath.Join(path, "keys"), } - sort.Sort(sort.StringSlice(want)) - sort.Sort(sort.StringSlice(dirs)) + sort.Strings(want) + sort.Strings(dirs) if !reflect.DeepEqual(dirs, want) { t.Fatalf("wrong paths returned, want:\n %v\ngot:\n %v", want, dirs) @@ -335,8 +335,8 @@ func TestS3LegacyLayout(t *testing.T) { filepath.Join(path, "key"), } - sort.Sort(sort.StringSlice(want)) - sort.Sort(sort.StringSlice(dirs)) + sort.Strings(want) + sort.Strings(dirs) if !reflect.DeepEqual(dirs, want) { t.Fatalf("wrong paths returned, want:\n %v\ngot:\n %v", want, dirs) diff --git a/internal/fs/fs_reader_test.go b/internal/fs/fs_reader_test.go index bb45732f3..173aec10d 100644 --- a/internal/fs/fs_reader_test.go +++ b/internal/fs/fs_reader_test.go @@ -72,8 +72,8 @@ func verifyDirectoryContents(t testing.TB, fs FS, dir string, want []string) { t.Fatal(err) } - sort.Sort(sort.StringSlice(want)) - sort.Sort(sort.StringSlice(entries)) + sort.Strings(want) + sort.Strings(entries) if !cmp.Equal(want, entries) { t.Error(cmp.Diff(want, entries)) diff --git a/internal/ui/backup.go b/internal/ui/backup.go index cda2d429d..e47f19f04 100644 --- a/internal/ui/backup.go +++ b/internal/ui/backup.go @@ -176,7 +176,7 @@ func (b *Backup) update(total, processed counter, errors uint, currentFiles map[ for filename := range currentFiles { lines = append(lines, filename) } - sort.Sort(sort.StringSlice(lines)) + sort.Strings(lines) lines = append([]string{status}, lines...) b.term.SetStatus(lines) diff --git a/internal/ui/jsonstatus/status.go b/internal/ui/jsonstatus/status.go index cc5b60543..3c8bc5545 100644 --- a/internal/ui/jsonstatus/status.go +++ b/internal/ui/jsonstatus/status.go @@ -159,7 +159,7 @@ func (b *Backup) update(total, processed counter, errors uint, currentFiles map[ for filename := range currentFiles { status.CurrentFiles = append(status.CurrentFiles, filename) } - sort.Sort(sort.StringSlice(status.CurrentFiles)) + sort.Strings(status.CurrentFiles) json.NewEncoder(b.StdioWrapper.Stdout()).Encode(status) }