all: replace exp/slices with slices

The experimental functions in golang.org/x/exp/slices are now
available in the standard library in Go 1.21.

Change-Id: Iac265a7c592ea79fcdd3d85277b57f6e7edf53c3
Reviewed-on: https://go-review.googlesource.com/c/vulndb/+/646116
Reviewed-by: Dmitri Shuralyov <[email protected]>
Reviewed-by: qiu laidongfeng2 <[email protected]>
Auto-Submit: Damien Neil <[email protected]>
Reviewed-by: Damien Neil <[email protected]>
LUCI-TryBot-Result: Go LUCI <[email protected]>

Author: Juneezee

cmd/vulnreport/creator.go

@@ -9,9 +9,9 @@ import (
 	"fmt"
 	"net/http"
 	"os"
+	"slices"
 	"strings"
 
-	"golang.org/x/exp/slices"
 	"golang.org/x/vulndb/cmd/vulnreport/log"
 	"golang.org/x/vulndb/internal/idstr"
 	"golang.org/x/vulndb/internal/issues"

cmd/vulnreport/find_aliases.go

@@ -8,8 +8,8 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"slices"
 
-	"golang.org/x/exp/slices"
 	"golang.org/x/tools/txtar"
 	"golang.org/x/vulndb/cmd/vulnreport/log"
 	"golang.org/x/vulndb/internal/cve5"

cmd/vulnreport/fix.go

@@ -11,10 +11,10 @@ import (
 	"net/http"
 	"regexp"
 	"runtime"
+	"slices"
 	"strings"
 
 	"github.com/google/go-cmp/cmp"
-	"golang.org/x/exp/slices"
 	"golang.org/x/vulndb/cmd/vulnreport/log"
 	"golang.org/x/vulndb/internal/osvutils"
 	"golang.org/x/vulndb/internal/pkgsite"

cmd/vulnreport/triage.go

@@ -9,11 +9,11 @@ import (
 	_ "embed"
 	"fmt"
 	"path/filepath"
+	"slices"
 	"strconv"
 	"strings"
 	"sync"
 
-	"golang.org/x/exp/slices"
 	"golang.org/x/vulndb/cmd/vulnreport/log"
 	"golang.org/x/vulndb/internal/issues"
 	"golang.org/x/vulndb/internal/report"

cmd/vulnreport/xref.go

@@ -8,8 +8,6 @@ import (
 	"context"
 	"fmt"
 
-	"golang.org/x/exp/constraints"
-	"golang.org/x/exp/slices"
 	"golang.org/x/vulndb/cmd/vulnreport/log"
 	"golang.org/x/vulndb/internal/report"
 	"golang.org/x/vulndb/internal/triage/priority"
@@ -94,9 +92,3 @@ func (x *xrefer) modulePriority(modulePath string) (*priority.Result, *priority.
 func (x *xrefer) reportPriority(r *report.Report) (*priority.Result, *priority.NotGoResult) {
 	return priority.AnalyzeReport(r, x.rc, x.moduleMap)
 }
-
-func sorted[E constraints.Ordered](s []E) []E {
-	s = slices.Clone(s)
-	slices.Sort(s)
-	return s
-}

internal/cveutils/list.go

@@ -10,10 +10,9 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"slices"
 	"strings"
 	"time"
-
-	"golang.org/x/exp/slices"
 )
 
 const deltaLogURL = "https://raw.githubusercontent.com/CVEProject/cvelistV5/main/cves/deltaLog.json"

internal/database/database.go

@@ -9,9 +9,9 @@ package database
 import (
 	"encoding/json"
 	"fmt"
+	"slices"
 
 	"golang.org/x/exp/maps"
-	"golang.org/x/exp/slices"
 	"golang.org/x/vulndb/internal/osv"
 )
 

internal/database/load.go

@@ -10,8 +10,8 @@ import (
 	"io/fs"
 	"os"
 	"path/filepath"
+	"slices"
 
-	"golang.org/x/exp/slices"
 	"golang.org/x/vulndb/internal/derrors"
 	"golang.org/x/vulndb/internal/osv"
 	"golang.org/x/vulndb/internal/osvutils"

internal/proxy/proxy.go

@@ -14,11 +14,11 @@ import (
 	"net/http"
 	"os"
 	urlpath "path"
+	"slices"
 	"sort"
 	"strings"
 	"sync"
 
-	"golang.org/x/exp/slices"
 	"golang.org/x/mod/modfile"
 	"golang.org/x/mod/module"
 	"golang.org/x/vulndb/internal/derrors"

internal/report/client.go

@@ -9,12 +9,12 @@ import (
 	"fmt"
 	"io"
 	"path/filepath"
+	"slices"
 	"strings"
 
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing/object"
 	"golang.org/x/exp/maps"
-	"golang.org/x/exp/slices"
 	"golang.org/x/vulndb/internal/gitrepo"
 	"gopkg.in/yaml.v3"
 )

internal/report/fix.go

@@ -8,12 +8,12 @@ import (
 	"errors"
 	"fmt"
 	"regexp"
+	"slices"
 	"sort"
 	"strconv"
 	"strings"
 
 	"golang.org/x/exp/maps"
-	"golang.org/x/exp/slices"
 	"golang.org/x/mod/module"
 	"golang.org/x/vulndb/internal/idstr"
 	"golang.org/x/vulndb/internal/osv"

internal/report/lint.go

@@ -10,10 +10,10 @@ import (
 	"net/url"
 	"path/filepath"
 	"regexp"
+	"slices"
 	"strings"
 	"unicode"
 
-	"golang.org/x/exp/slices"
 	"golang.org/x/mod/module"
 	"golang.org/x/vulndb/internal/derrors"
 	"golang.org/x/vulndb/internal/idstr"

internal/report/report.go

@@ -14,11 +14,11 @@ import (
 	"os"
 	"path/filepath"
 	"regexp"
+	"slices"
 	"strconv"
 	"strings"
 	"time"
 
-	"golang.org/x/exp/slices"
 	"golang.org/x/vulndb/internal/derrors"
 	"golang.org/x/vulndb/internal/idstr"
 	"golang.org/x/vulndb/internal/osv"

internal/symbols/exported_functions.go

@@ -11,10 +11,9 @@ import (
 	"go/types"
 	"os"
 	"os/exec"
-	"sort"
+	"slices"
 	"strings"
 
-	"golang.org/x/exp/slices"
 	"golang.org/x/tools/go/packages"
 	"golang.org/x/vulndb/internal/derrors"
 	"golang.org/x/vulndb/internal/osvutils"
@@ -138,7 +137,7 @@ func Exported(m *report.Module, p *report.Package) (_ []string, err error) {
 			newslice = append(newslice, s)
 		}
 	}
-	sort.Strings(newslice)
+	slices.Sort(newslice)
 	return newslice, nil
 }
 

internal/symbols/populate.go

@@ -10,10 +10,10 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"slices"
 	"strings"
 
 	"github.com/go-git/go-git/v5"
-	"golang.org/x/exp/slices"
 	"golang.org/x/vulndb/internal/gitrepo"
 	"golang.org/x/vulndb/internal/report"
 )