chore(BRIDGE-534): replace exp/maps and exp/slice with common utils & stdlib packages

benchmarks/gluon_bench/benchmark/run.go

@@ -6,10 +6,10 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"slices"
 
 	"github.com/ProtonMail/gluon/benchmarks/gluon_bench/flags"
 	"github.com/ProtonMail/gluon/benchmarks/gluon_bench/reporter"
-	"golang.org/x/exp/slices"
 )
 
 func RunMain() {

connector/dummy.go

@@ -5,16 +5,16 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"slices"
 	"sync"
 	"sync/atomic"
 	"time"
 
 	"github.com/ProtonMail/gluon/constants"
 	"github.com/ProtonMail/gluon/imap"
 	"github.com/ProtonMail/gluon/internal/ticker"
-	"github.com/ProtonMail/gluon/internal/utils"
+	"github.com/ProtonMail/gluon/pkg/utils"
 	"github.com/sirupsen/logrus"
-	"golang.org/x/exp/slices"
 )
 
 var (

connector/dummy_state.go

@@ -6,9 +6,9 @@ import (
 	"time"
 
 	"github.com/ProtonMail/gluon/imap"
+	"github.com/ProtonMail/gluon/pkg/utils"
 	"github.com/bradenaw/juniper/xslices"
 	"github.com/google/uuid"
-	"golang.org/x/exp/maps"
 )
 
 type dummyState struct {
@@ -61,7 +61,7 @@ func (state *dummyState) getMailboxes() []imap.Mailbox {
 	state.lock.Lock()
 	defer state.lock.Unlock()
 
-	return xslices.Map(maps.Keys(state.mailboxes), func(mboxID imap.MailboxID) imap.Mailbox {
+	return xslices.Map(utils.Keys(state.mailboxes), func(mboxID imap.MailboxID) imap.Mailbox {
 		return state.toMailbox(mboxID)
 	})
 }
@@ -132,7 +132,7 @@ func (state *dummyState) getMessages() []imap.Message {
 	state.lock.Lock()
 	defer state.lock.Unlock()
 
-	return xslices.Map(maps.Keys(state.messages), func(messageID imap.MessageID) imap.Message {
+	return xslices.Map(utils.Keys(state.messages), func(messageID imap.MessageID) imap.Message {
 		return state.toMessage(messageID)
 	})
 }
@@ -149,7 +149,7 @@ func (state *dummyState) getMessageCreatedUpdate(id imap.MessageID) (*imap.Messa
 	return &imap.MessageCreated{
 		Message:       state.toMessage(id),
 		Literal:       msg.literal,
-		MailboxIDs:    maps.Keys(msg.mboxIDs),
+		MailboxIDs:    utils.Keys(msg.mboxIDs),
 		ParsedMessage: msg.parsed,
 	}, nil
 }
@@ -170,7 +170,7 @@ func (state *dummyState) getMailboxIDs(messageID imap.MessageID) []imap.MailboxI
 	state.lock.Lock()
 	defer state.lock.Unlock()
 
-	return maps.Keys(state.messages[messageID].mboxIDs)
+	return utils.Keys(state.messages[messageID].mboxIDs)
 }
 
 // nolint: unused

go.mod

@@ -17,7 +17,6 @@ require (
 	github.com/sirupsen/logrus v1.9.4
 	github.com/stretchr/testify v1.11.1
 	go.uber.org/goleak v1.3.0
-	golang.org/x/exp v0.0.0-20260312153236-7ab1446f8b90
 	golang.org/x/sys v0.43.0
 	golang.org/x/text v0.36.0
 	gopkg.in/yaml.v3 v3.0.1
@@ -31,6 +30,7 @@ require (
 	github.com/kr/pretty v0.3.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rogpeppe/go-internal v1.10.0 // indirect
+	golang.org/x/exp v0.0.0-20260312153236-7ab1446f8b90 // indirect
 	golang.org/x/sync v0.20.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 )

imap/flags.go

@@ -1,10 +1,10 @@
 package imap
 
 import (
+	"slices"
 	"strings"
 
-	"golang.org/x/exp/maps"
-	"golang.org/x/exp/slices"
+	"github.com/ProtonMail/gluon/pkg/utils"
 )
 
 const (
@@ -70,7 +70,7 @@ func (fs FlagSet) Len() int {
 // ToSlice Returns the list of flags in the set as a sorted string slice. The returned list is a hard copy of the internal
 // slice to avoid direct modifications of the FlagSet value that would break the uniqueness and case insensitivity rules.
 func (fs FlagSet) ToSlice() []string {
-	flags := maps.Values(fs)
+	flags := utils.Values(fs)
 
 	slices.Sort(flags)
 
@@ -79,7 +79,7 @@ func (fs FlagSet) ToSlice() []string {
 
 // ToSliceUnsorted is the same as ToSlice, but does not sort the returned value.
 func (fs FlagSet) ToSliceUnsorted() []string {
-	return maps.Values(fs)
+	return utils.Values(fs)
 }
 
 // Contains returns true if and only if the flag is in the set.
@@ -146,11 +146,11 @@ func (fs FlagSet) AddToSelf(flags ...string) {
 }
 
 func (fs FlagSet) AddFlagSet(set FlagSet) FlagSet {
-	return fs.Add(maps.Values(set)...)
+	return fs.Add(utils.Values(set)...)
 }
 
 func (fs FlagSet) AddFlagSetToSelf(set FlagSet) {
-	fs.add(maps.Values(set)...)
+	fs.add(utils.Values(set)...)
 }
 
 func (fs FlagSet) add(flags ...string) {
@@ -191,15 +191,15 @@ func (fs FlagSet) Remove(flags ...string) FlagSet {
 }
 
 func (fs FlagSet) RemoveFlagSet(set FlagSet) FlagSet {
-	return fs.Remove(maps.Values(set)...)
+	return fs.Remove(utils.Values(set)...)
 }
 
 func (fs FlagSet) RemoveFromSelf(flags ...string) {
 	fs.remove(flags...)
 }
 
 func (fs FlagSet) RemoveFlagSetFromSelf(set FlagSet) {
-	fs.Remove(maps.Values(set)...)
+	fs.Remove(utils.Values(set)...)
 }
 
 func (fs FlagSet) remove(flags ...string) {

imap/params.go

@@ -2,11 +2,11 @@ package imap
 
 import (
 	"net/mail"
+	"slices"
 	"strconv"
 	"strings"
 
-	"golang.org/x/exp/maps"
-	"golang.org/x/exp/slices"
+	"github.com/ProtonMail/gluon/pkg/utils"
 )
 
 type parListWriter interface {
@@ -114,7 +114,7 @@ func (c *paramList) addNumber(writer parListWriter, v int) *paramList {
 func (c *paramList) addMap(writer parListWriter, v map[string]string) *paramList {
 	c.onWrite(writer)
 
-	keys := maps.Keys(v)
+	keys := utils.Keys(v)
 
 	slices.Sort(keys)
 

imap/seqset.go

@@ -2,11 +2,11 @@ package imap
 
 import (
 	"fmt"
+	"slices"
 	"strconv"
 	"strings"
 
 	"github.com/bradenaw/juniper/xslices"
-	"golang.org/x/exp/slices"
 )
 
 type SeqVal struct {

imap/uid_validity_generator_test.go

@@ -1,13 +1,13 @@
 package imap
 
 import (
+	"slices"
 	"testing"
 	"time"
 
 	"github.com/bradenaw/juniper/parallel"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/exp/slices"
 )
 
 func TestEpochUIDValidityGenerator_Generate(t *testing.T) {

internal/backend/connector_updates.go

@@ -7,18 +7,18 @@ import (
 	"io"
 	"os"
 	"runtime"
+	"slices"
 	"strings"
 
 	"github.com/ProtonMail/gluon/db"
 	"github.com/ProtonMail/gluon/imap"
 	"github.com/ProtonMail/gluon/internal/ids"
 	"github.com/ProtonMail/gluon/internal/state"
-	"github.com/ProtonMail/gluon/internal/utils"
+	"github.com/ProtonMail/gluon/pkg/utils"
 	"github.com/ProtonMail/gluon/rfc822"
 	"github.com/bradenaw/juniper/parallel"
 	"github.com/bradenaw/juniper/xslices"
 	"github.com/sirupsen/logrus"
-	"golang.org/x/exp/slices"
 )
 
 // apply an incoming update originating from the connector.
@@ -344,7 +344,9 @@ func (user *user) applyMessagesCreated(ctx context.Context, update *imap.Message
 					messageForMBox[v] = messageList
 				}
 
-				if !slices.ContainsFunc(messageList, func(id db.MessageIDPair) bool { return id.InternalID == internalID }) {
+				if !slices.ContainsFunc(messageList, func(id db.MessageIDPair) bool {
+					return id.InternalID == internalID
+				}) {
 					messageList = append(messageList, db.MessageIDPair{InternalID: internalID, RemoteID: message.Message.ID})
 					messageForMBox[v] = messageList
 				}

internal/backend/user.go

@@ -16,11 +16,11 @@ import (
 	"github.com/ProtonMail/gluon/logging"
 	"github.com/ProtonMail/gluon/observability"
 	"github.com/ProtonMail/gluon/observability/metrics"
+	pkgutils "github.com/ProtonMail/gluon/pkg/utils"
 	"github.com/ProtonMail/gluon/reporter"
 	"github.com/ProtonMail/gluon/store"
 	"github.com/bradenaw/juniper/xslices"
 	"github.com/sirupsen/logrus"
-	"golang.org/x/exp/maps"
 )
 
 type user struct {
@@ -298,8 +298,8 @@ func (user *user) removeState(ctx context.Context, st *state.State) error {
 			return nil, fmt.Errorf("no such state")
 		}
 
-		messageIDs = utils.Filter(messageIDs, func(messageID imap.InternalMessageID) bool {
-			return xslices.CountFunc(maps.Values(user.states), func(other *state.State) bool {
+		messageIDs = pkgutils.Filter(messageIDs, func(messageID imap.InternalMessageID) bool {
+			return xslices.CountFunc(pkgutils.Values(user.states), func(other *state.State) bool {
 				return st != other && other.HasMessage(messageID)
 			}) == 0
 		})
@@ -372,7 +372,7 @@ func (user *user) cleanupStaleStoreData(ctx context.Context) error {
 		return err
 	}
 
-	idsToDelete := utils.Filter(storeIds, func(id imap.InternalMessageID) bool {
+	idsToDelete := pkgutils.Filter(storeIds, func(id imap.InternalMessageID) bool {
 		_, ok := dbIdMap[id]
 
 		return !ok

internal/db_impl/sqlite3/migration_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"slices"
 	"strings"
 	"testing"
 	"time"
@@ -15,7 +16,6 @@ import (
 	"github.com/bradenaw/juniper/xslices"
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/exp/slices"
 )
 
 func TestMigration_VersionTooHigh(t *testing.T) {

internal/response/capability.go

@@ -2,9 +2,9 @@ package response
 
 import (
 	"fmt"
+	"slices"
 
 	"github.com/ProtonMail/gluon/imap"
-	"golang.org/x/exp/slices"
 )
 
 type capability struct {

internal/response/item_capability.go

@@ -2,9 +2,9 @@ package response
 
 import (
 	"fmt"
+	"slices"
 
 	"github.com/ProtonMail/gluon/imap"
-	"golang.org/x/exp/slices"
 )
 
 type itemCapability struct {

internal/response/search.go

@@ -3,7 +3,7 @@ package response
 import (
 	"strconv"
 
-	"golang.org/x/exp/slices"
+	"slices"
 )
 
 type search struct {

internal/session/session.go

@@ -14,6 +14,8 @@ import (
 	"sync"
 	"time"
 
+	"slices"
+
 	"github.com/ProtonMail/gluon/async"
 	"github.com/ProtonMail/gluon/events"
 	"github.com/ProtonMail/gluon/imap"
@@ -29,7 +31,6 @@ import (
 	"github.com/ProtonMail/gluon/version"
 	"github.com/emersion/go-imap/utf7"
 	"github.com/sirupsen/logrus"
-	"golang.org/x/exp/slices"
 )
 
 const maxSessionError = 20