switch golang.org/x/exp/slices usages to stdlib

As of Go 1.21, golang.org/x/exp/slices is now in the standard library as slices. A similar conversion can be done for golang.org/x/exp/maps in Go 1.22, dependent on maps.Keys. Signed-off-by: Spencer Schrock <[email protected]>
spencerschrock · Dec 5, 2023 · c1b9ed1 · c1b9ed1
1 parent 56a6590
commit c1b9ed1
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 11 deletions.
diff --git a/cmd/osv-scanner/main.go b/cmd/osv-scanner/main.go
@@ -5,13 +5,13 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"slices"
 	"strings"
 
 	"github.com/google/osv-scanner/internal/version"
 	"github.com/google/osv-scanner/pkg/osv"
 	"github.com/google/osv-scanner/pkg/osvscanner"
 	"github.com/google/osv-scanner/pkg/reporter"
-	"golang.org/x/exp/slices"
 	"golang.org/x/term"
 
 	"github.com/urfave/cli/v2"

diff --git a/internal/ci/vulnerability_result_diff.go b/internal/ci/vulnerability_result_diff.go
@@ -1,9 +1,10 @@
 package ci
 
 import (
+	"slices"
+
 	"github.com/google/osv-scanner/pkg/grouper"
 	"github.com/google/osv-scanner/pkg/models"
-	"golang.org/x/exp/slices"
 )
 
 // DiffVulnerabilityResults will return any new vulnerabilities that are in `newRes`

diff --git a/internal/output/identifiers_test.go b/internal/output/identifiers_test.go
@@ -1,9 +1,8 @@
 package output
 
 import (
+	"slices"
 	"testing"
-
-	"golang.org/x/exp/slices"
 )
 
 func Test_idSortFunc(t *testing.T) {

diff --git a/internal/output/result.go b/internal/output/result.go
@@ -2,9 +2,9 @@ package output
 
 import (
 	"encoding/json"
+	"slices"
 
 	"github.com/google/osv-scanner/pkg/models"
-	"golang.org/x/exp/slices"
 )
 
 type pkgWithSource struct {

diff --git a/internal/output/sarif.go b/internal/output/sarif.go
@@ -5,6 +5,7 @@ import (
 	"io"
 	"log"
 	"path/filepath"
+	"slices"
 	"strings"
 	"text/template"
 
@@ -15,7 +16,6 @@ import (
 	"github.com/jedib0t/go-pretty/v6/table"
 	"github.com/owenrumney/go-sarif/v2/sarif"
 	"golang.org/x/exp/maps"
-	"golang.org/x/exp/slices"
 )
 
 type HelpTemplateData struct {

diff --git a/internal/utility/vulns/vulnerability.go b/internal/utility/vulns/vulnerability.go
@@ -3,12 +3,12 @@ package vulns
 import (
 	"fmt"
 	"os"
+	"slices"
 	"sort"
 
 	"github.com/google/osv-scanner/internal/semantic"
 	"github.com/google/osv-scanner/pkg/lockfile"
 	"github.com/google/osv-scanner/pkg/models"
-	"golang.org/x/exp/slices"
 )
 
 func eventVersion(e models.Event) string {

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -4,11 +4,11 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"slices"
 	"time"
 
 	"github.com/BurntSushi/toml"
 	"github.com/google/osv-scanner/pkg/reporter"
-	"golang.org/x/exp/slices"
 )
 
 const osvScannerConfigName = "osv-scanner.toml"

diff --git a/pkg/grouper/grouper.go b/pkg/grouper/grouper.go
@@ -1,10 +1,10 @@
 package grouper
 
 import (
+	"slices"
 	"sort"
 
 	"golang.org/x/exp/maps"
-	"golang.org/x/exp/slices"
 
 	"github.com/google/osv-scanner/pkg/models"
 )

diff --git a/pkg/models/results.go b/pkg/models/results.go
@@ -1,9 +1,8 @@
 package models
 
 import (
+	"slices"
 	"strings"
-
-	"golang.org/x/exp/slices"
 )
 
 // Combined vulnerabilities found for the scanned packages