[MM-57356] Make use of go1.21 features (#26620)

server/channels/store/searchtest/testlib.go

@@ -4,10 +4,9 @@
 package searchtest
 
 import (
+	"slices"
 	"testing"
 
-	pUtils "github.com/mattermost/mattermost/server/public/utils"
-
 	"github.com/mattermost/mattermost/server/v8/channels/store"
 )
 
@@ -36,12 +35,12 @@ type searchTest struct {
 func filterTestsByTag(tests []searchTest, tags ...string) []searchTest {
 	filteredTests := []searchTest{}
 	for _, test := range tests {
-		if pUtils.Contains(test.Tags, EngineAll) {
+		if slices.Contains(test.Tags, EngineAll) {
 			filteredTests = append(filteredTests, test)
 			continue
 		}
 		for _, tag := range tags {
-			if pUtils.Contains(test.Tags, tag) {
+			if slices.Contains(test.Tags, tag) {
 				filteredTests = append(filteredTests, test)
 				break
 			}

server/channels/store/sqlstore/channel_bookmark_store.go

@@ -4,15 +4,15 @@
 package sqlstore
 
 import (
+	"slices"
 	"strconv"
 
 	sq "github.com/mattermost/squirrel"
+	"github.com/pkg/errors"
 
 	"github.com/mattermost/mattermost/server/public/model"
 	"github.com/mattermost/mattermost/server/v8/channels/store"
 	"github.com/mattermost/mattermost/server/v8/channels/utils"
-
-	"github.com/pkg/errors"
 )
 
 type SqlChannelBookmarkStore struct {
@@ -262,7 +262,7 @@ func (s *SqlChannelBookmarkStore) UpdateSortOrder(bookmarkId, channelId string,
 	}
 
 	bookmarks = utils.RemoveElementFromSliceAtIndex(bookmarks, currentIndex)
-	bookmarks = utils.InsertElementToSliceAtIndex(bookmarks, current, int(newIndex))
+	bookmarks = slices.Insert(bookmarks, int(newIndex), current)
 	caseStmt := sq.Case()
 	query := s.getQueryBuilder().
 		Update("ChannelBookmarks")

server/channels/store/storetest/group_store.go

@@ -7,6 +7,7 @@ import (
 	"errors"
 	"fmt"
 	"math"
+	"slices"
 	"sort"
 	"strings"
 	"testing"
@@ -17,7 +18,6 @@ import (
 
 	"github.com/mattermost/mattermost/server/public/model"
 	"github.com/mattermost/mattermost/server/public/shared/request"
-	pUtils "github.com/mattermost/mattermost/server/public/utils"
 	"github.com/mattermost/mattermost/server/v8/channels/store"
 )
 
@@ -4826,7 +4826,7 @@ func groupTestpUpdateMembersRoleTeam(t *testing.T, rctx request.CTX, ss store.St
 			require.GreaterOrEqual(t, len(members), 4) // sanity check for team membership
 
 			for _, member := range members {
-				if pUtils.Contains(tt.inUserIDs, member.UserId) {
+				if slices.Contains(tt.inUserIDs, member.UserId) {
 					require.True(t, member.SchemeAdmin)
 				} else {
 					require.False(t, member.SchemeAdmin)
@@ -4936,7 +4936,7 @@ func groupTestpUpdateMembersRoleChannel(t *testing.T, rctx request.CTX, ss store
 			require.GreaterOrEqual(t, len(members), 4) // sanity check for channel membership
 
 			for _, member := range members {
-				if pUtils.Contains(tt.inUserIDs, member.UserId) {
+				if slices.Contains(tt.inUserIDs, member.UserId) {
 					require.True(t, member.SchemeAdmin)
 				} else {
 					require.False(t, member.SchemeAdmin)