chore: replace golang.org/x/exp/maps by maps

Author: ldez

go.mod

@@ -126,7 +126,6 @@ require (
 	go-simpler.org/musttag v0.13.0
 	go-simpler.org/sloglint v0.7.2
 	go.uber.org/automaxprocs v1.6.0
-	golang.org/x/exp v0.0.0-20240909161429-701f63a606c0
 	golang.org/x/mod v0.22.0
 	golang.org/x/sys v0.29.0
 	golang.org/x/tools v0.28.0
@@ -196,6 +195,7 @@ require (
 	go.uber.org/atomic v1.7.0 // indirect
 	go.uber.org/multierr v1.6.0 // indirect
 	go.uber.org/zap v1.24.0 // indirect
+	golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
 	golang.org/x/exp/typeparams v0.0.0-20241108190413-2d47ceb2692f // indirect
 	golang.org/x/sync v0.10.0 // indirect
 	golang.org/x/text v0.20.0 // indirect

internal/cache/cache.go

@@ -6,12 +6,12 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
+	"maps"
 	"runtime"
 	"slices"
 	"strings"
 	"sync"
 
-	"golang.org/x/exp/maps"
 	"golang.org/x/tools/go/packages"
 
 	"github.com/golangci/golangci-lint/internal/go/cache"
@@ -178,9 +178,7 @@ func (c *Cache) computePkgHash(pkg *packages.Package) (hashResults, error) {
 	curSum := key.Sum()
 	hashRes[HashModeNeedOnlySelf] = hex.EncodeToString(curSum[:])
 
-	imps := maps.Values(pkg.Imports)
-
-	slices.SortFunc(imps, func(a, b *packages.Package) int {
+	imps := slices.SortedFunc(maps.Values(pkg.Imports), func(a, b *packages.Package) int {
 		return strings.Compare(a.PkgPath, b.PkgPath)
 	})
 

pkg/commands/run.go

@@ -8,12 +8,13 @@ import (
 	"fmt"
 	"io"
 	"log"
+	"maps"
 	"os"
 	"path/filepath"
 	"runtime"
 	"runtime/pprof"
 	"runtime/trace"
-	"sort"
+	"slices"
 	"strconv"
 	"strings"
 	"time"
@@ -24,7 +25,6 @@ import (
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
 	"go.uber.org/automaxprocs/maxprocs"
-	"golang.org/x/exp/maps"
 	"gopkg.in/yaml.v3"
 
 	"github.com/golangci/golangci-lint/internal/cache"
@@ -452,8 +452,7 @@ func (c *runCommand) printStats(issues []result.Issue) {
 
 	c.cmd.Printf("%d issues:\n", len(issues))
 
-	keys := maps.Keys(stats)
-	sort.Strings(keys)
+	keys := slices.Sorted(maps.Keys(stats))
 
 	for _, key := range keys {
 		c.cmd.Printf("* %s: %d\n", key, stats[key])

pkg/goanalysis/runner.go

@@ -8,11 +8,11 @@ import (
 	"encoding/gob"
 	"fmt"
 	"go/token"
+	"maps"
 	"runtime"
-	"sort"
+	"slices"
 	"sync"
 
-	"golang.org/x/exp/maps"
 	"golang.org/x/tools/go/analysis"
 	"golang.org/x/tools/go/packages"
 
@@ -159,8 +159,8 @@ func (r *runner) buildActionFactDeps(act *action, a *analysis.Analyzer, pkg *pac
 	act.objectFacts = make(map[objectFactKey]analysis.Fact)
 	act.packageFacts = make(map[packageFactKey]analysis.Fact)
 
-	paths := maps.Keys(pkg.Imports)
-	sort.Strings(paths) // for determinism
+	paths := slices.Sorted(maps.Keys(pkg.Imports)) // for determinism
+
 	for _, path := range paths {
 		dep := r.makeAction(a, pkg.Imports[path], initialPkgs, actions, actAlloc)
 		act.Deps = append(act.Deps, dep)
@@ -209,7 +209,7 @@ func (r *runner) prepareAnalysis(pkgs []*packages.Package,
 		}
 	}
 
-	allActions = maps.Values(actions)
+	allActions = slices.Collect(maps.Values(actions))
 
 	debugf("Built %d actions", len(actions))
 

pkg/golinters/gocritic/gocritic.go

@@ -5,17 +5,16 @@ import (
 	"fmt"
 	"go/ast"
 	"go/types"
+	"maps"
 	"reflect"
 	"runtime"
 	"slices"
-	"sort"
 	"strings"
 	"sync"
 
 	"github.com/go-critic/go-critic/checkers"
 	gocriticlinter "github.com/go-critic/go-critic/linter"
 	_ "github.com/quasilyte/go-ruleguard/dsl"
-	"golang.org/x/exp/maps"
 	"golang.org/x/tools/go/analysis"
 
 	"github.com/golangci/golangci-lint/pkg/config"
@@ -163,8 +162,7 @@ func (w *goCriticWrapper) configureCheckerInfo(
 				info.Name, k)
 		}
 
-		supportedKeys := maps.Keys(info.Params)
-		sort.Strings(supportedKeys)
+		supportedKeys := slices.Sorted(maps.Keys(info.Params))
 
 		return fmt.Errorf("checker %s config param %s doesn't exist, all existing: %s",
 			info.Name, k, supportedKeys)
@@ -265,8 +263,7 @@ func newSettingsWrapper(settings *config.GoCriticSettings, logger logutils.Log)
 		}
 	}
 
-	allTagsSorted := maps.Keys(allChecksByTag)
-	sort.Strings(allTagsSorted)
+	allTagsSorted := slices.Sorted(maps.Keys(allChecksByTag))
 
 	return &settingsWrapper{
 		GoCriticSettings:                settings,
@@ -553,6 +550,5 @@ func debugChecksListf(checks []string, format string, args ...any) {
 }
 
 func sprintSortedStrings(v []string) string {
-	sort.Strings(slices.Clone(v))
-	return fmt.Sprint(v)
+	return fmt.Sprint(slices.Sorted(slices.Values(v)))
 }

pkg/golinters/gocritic/gocritic_test.go

@@ -1,6 +1,7 @@
 package gocritic
 
 import (
+	"maps"
 	"slices"
 	"strings"
 	"testing"
@@ -9,7 +10,6 @@ import (
 	gocriticlinter "github.com/go-critic/go-critic/linter"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/exp/maps"
 
 	"github.com/golangci/golangci-lint/pkg/config"
 	"github.com/golangci/golangci-lint/pkg/logutils"
@@ -40,7 +40,7 @@ func Test_settingsWrapper_InferEnabledChecks(t *testing.T) {
 	t.Logf("enabled by default checks:\n%s", strings.Join(enabledByDefaultChecks, "\n"))
 
 	insert := func(in []string, toInsert ...string) []string {
-		return append(slices.Clone(in), toInsert...)
+		return slices.Concat(in, toInsert)
 	}
 
 	remove := func(in []string, toRemove ...string) []string {
@@ -54,9 +54,7 @@ func Test_settingsWrapper_InferEnabledChecks(t *testing.T) {
 	}
 
 	uniq := func(in []string) []string {
-		result := slices.Clone(in)
-		slices.Sort(result)
-		return slices.Compact(result)
+		return slices.Compact(slices.Sorted(slices.Values(in)))
 	}
 
 	cases := []struct {
@@ -269,7 +267,7 @@ func Test_settingsWrapper_InferEnabledChecks(t *testing.T) {
 			wr := newSettingsWrapper(tt.sett, lg)
 
 			wr.InferEnabledChecks()
-			assert.ElementsMatch(t, tt.expectedEnabledChecks, maps.Keys(wr.inferredEnabledChecks))
+			assert.ElementsMatch(t, tt.expectedEnabledChecks, slices.Collect(maps.Keys(wr.inferredEnabledChecks)))
 			assert.NoError(t, wr.Validate())
 		})
 	}

pkg/golinters/thelper/thelper.go

@@ -1,10 +1,11 @@
 package thelper
 
 import (
+	"maps"
+	"slices"
 	"strings"
 
 	"github.com/kulti/thelper/pkg/analyzer"
-	"golang.org/x/exp/maps"
 	"golang.org/x/tools/go/analysis"
 
 	"github.com/golangci/golangci-lint/pkg/config"
@@ -44,7 +45,7 @@ func New(settings *config.ThelperSettings) *goanalysis.Linter {
 		internal.LinterLogger.Fatalf("thelper: at least one option must be enabled")
 	}
 
-	args := maps.Keys(opts)
+	args := slices.Collect(maps.Keys(opts))
 
 	cfg := map[string]map[string]any{
 		a.Name: {

pkg/lint/lintersdb/manager.go

@@ -2,11 +2,11 @@ package lintersdb
 
 import (
 	"fmt"
+	"maps"
 	"os"
 	"slices"
 	"sort"
-
-	"golang.org/x/exp/maps"
+	"strings"
 
 	"github.com/golangci/golangci-lint/pkg/config"
 	"github.com/golangci/golangci-lint/pkg/goanalysis"
@@ -109,24 +109,25 @@ func (m *Manager) GetOptimizedLinters() ([]*linter.Config, error) {
 
 	m.combineGoAnalysisLinters(resultLintersSet)
 
-	resultLinters := maps.Values(resultLintersSet)
-
 	// Make order of execution of linters (go/analysis metalinter and unused) stable.
-	sort.Slice(resultLinters, func(i, j int) bool {
-		a, b := resultLinters[i], resultLinters[j]
-
+	resultLinters := slices.SortedFunc(maps.Values(resultLintersSet), func(a *linter.Config, b *linter.Config) int {
 		if b.Name() == linter.LastLinter {
-			return true
+			return -1
 		}
 
 		if a.Name() == linter.LastLinter {
-			return false
+			return 1
 		}
 
 		if a.DoesChangeTypes != b.DoesChangeTypes {
-			return b.DoesChangeTypes // move type-changing linters to the end to optimize speed
+			// move type-changing linters to the end to optimize speed
+			if b.DoesChangeTypes {
+				return -1
+			}
+			return 1
 		}
-		return a.Name() < b.Name()
+
+		return strings.Compare(a.Name(), b.Name())
 	})
 
 	return resultLinters, nil

pkg/printers/checkstyle.go

@@ -4,10 +4,11 @@ import (
 	"encoding/xml"
 	"fmt"
 	"io"
-	"sort"
+	"maps"
+	"slices"
+	"strings"
 
 	"github.com/go-xmlfmt/xmlfmt"
-	"golang.org/x/exp/maps"
 
 	"github.com/golangci/golangci-lint/pkg/result"
 )
@@ -75,10 +76,8 @@ func (p Checkstyle) Print(issues []result.Issue) error {
 		file.Errors = append(file.Errors, newError)
 	}
 
-	out.Files = maps.Values(files)
-
-	sort.Slice(out.Files, func(i, j int) bool {
-		return out.Files[i].Name < out.Files[j].Name
+	out.Files = slices.SortedFunc(maps.Values(files), func(a *checkstyleFile, b *checkstyleFile) int {
+		return strings.Compare(a.Name, b.Name)
 	})
 
 	data, err := xml.Marshal(&out)

pkg/printers/junitxml.go

@@ -4,11 +4,10 @@ import (
 	"encoding/xml"
 	"fmt"
 	"io"
-	"sort"
+	"maps"
+	"slices"
 	"strings"
 
-	"golang.org/x/exp/maps"
-
 	"github.com/golangci/golangci-lint/pkg/result"
 )
 
@@ -84,10 +83,9 @@ func (p JunitXML) Print(issues []result.Issue) error {
 	}
 
 	var res testSuitesXML
-	res.TestSuites = maps.Values(suites)
 
-	sort.Slice(res.TestSuites, func(i, j int) bool {
-		return res.TestSuites[i].Suite < res.TestSuites[j].Suite
+	res.TestSuites = slices.SortedFunc(maps.Values(suites), func(a testSuiteXML, b testSuiteXML) int {
+		return strings.Compare(a.Suite, b.Suite)
 	})
 
 	enc := xml.NewEncoder(p.w)

pkg/result/processors/fixer.go

@@ -9,11 +9,10 @@ package processors
 import (
 	"errors"
 	"fmt"
+	"maps"
 	"os"
 	"slices"
 
-	"golang.org/x/exp/maps"
-
 	"github.com/golangci/golangci-lint/internal/x/tools/diff"
 	"github.com/golangci/golangci-lint/pkg/config"
 	"github.com/golangci/golangci-lint/pkg/fsutils"
@@ -124,7 +123,7 @@ func (p Fixer) process(issues []result.Issue) ([]result.Issue, error) {
 	for path, linterToEdits := range editsByLinter {
 		excludedLinters := make(map[string]struct{})
 
-		linters := maps.Keys(linterToEdits)
+		linters := slices.Collect(maps.Keys(linterToEdits))
 
 		// Does any linter create conflicting edits?
 		for _, linter := range linters {

pkg/result/processors/nolint.go

@@ -4,12 +4,12 @@ import (
 	"go/ast"
 	"go/parser"
 	"go/token"
+	"maps"
 	"regexp"
+	"slices"
 	"sort"
 	"strings"
 
-	"golang.org/x/exp/maps"
-
 	"github.com/golangci/golangci-lint/pkg/golinters/nolintlint"
 	"github.com/golangci/golangci-lint/pkg/lint/linter"
 	"github.com/golangci/golangci-lint/pkg/lint/lintersdb"
@@ -101,8 +101,7 @@ func (p *Nolint) Finish() {
 		return
 	}
 
-	unknownLinters := maps.Keys(p.unknownLintersSet)
-	sort.Strings(unknownLinters)
+	unknownLinters := slices.Sorted(maps.Keys(p.unknownLintersSet))
 
 	p.log.Warnf("Found unknown linters in //nolint directives: %s", strings.Join(unknownLinters, ", "))
 }

scripts/website/expand_templates/thanks.go

@@ -2,11 +2,10 @@ package main
 
 import (
 	"fmt"
-	"sort"
+	"maps"
+	"slices"
 	"strings"
 
-	"golang.org/x/exp/maps"
-
 	"github.com/golangci/golangci-lint/pkg/config"
 	"github.com/golangci/golangci-lint/pkg/lint/linter"
 	"github.com/golangci/golangci-lint/pkg/lint/lintersdb"
@@ -69,9 +68,8 @@ func getThanksList() string {
 		}
 	}
 
-	authors := maps.Keys(addedAuthors)
-	sort.Slice(authors, func(i, j int) bool {
-		return strings.ToLower(authors[i]) < strings.ToLower(authors[j])
+	authors := slices.SortedFunc(maps.Keys(addedAuthors), func(a string, b string) int {
+		return strings.Compare(strings.ToLower(a), strings.ToLower(b))
 	})
 
 	lines := []string{