update to go1.23 and replace golang.org/x/exp/maps with stdlib maps

This commit is contained in:
Mechiel Lukkien
2025-03-28 16:16:27 +01:00
parent 7a87522be0
commit 027e5754a0
21 changed files with 39 additions and 215 deletions

View File

@ -13,16 +13,15 @@ import (
"fmt"
"io"
"log/slog"
"maps"
"os"
"path"
"runtime/debug"
"sort"
"slices"
"strconv"
"strings"
"time"
"golang.org/x/exp/maps"
"golang.org/x/text/unicode/norm"
"github.com/mjl-/bstore"
@ -669,7 +668,7 @@ func importMessages(ctx context.Context, log mlog.Log, token string, acc *store.
m := store.Message{
Received: received,
Flags: flags,
Keywords: maps.Keys(keywords),
Keywords: slices.Sorted(maps.Keys(keywords)),
Size: size,
}
xdeliver(mb, &m, f, filename)
@ -755,8 +754,7 @@ func importMessages(ctx context.Context, log mlog.Log, token string, acc *store.
oflags := m.Flags
m.Flags = m.Flags.Set(flags, flags)
m.Keywords = maps.Keys(keywords)
sort.Strings(m.Keywords)
m.Keywords = slices.Sorted(maps.Keys(keywords))
mb.Add(m.MailboxCounts())