refactor: make use of slices.*

Author: jbedard

language/js/generate_test.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"path"
 	"reflect"
-	"sort"
+	"slices"
 	"testing"
 )
 
@@ -160,8 +160,8 @@ func assertImports(t *testing.T, p string, expected []string) {
 	actual := toImportPaths(p)
 
 	// Order doesn't matter so sort to ignore order
-	sort.Strings(actual)
-	sort.Strings(expected)
+	slices.Sort(actual)
+	slices.Sort(expected)
 
 	if !reflect.DeepEqual(actual, expected) {
 		t.Errorf("toImportPaths('%s'): \nactual:   %s\nexpected:  %s\n", p, actual, expected)

language/js/proto/proto.go

@@ -5,7 +5,7 @@ import (
 	"io/ioutil"
 	"log"
 	"regexp"
-	"sort"
+	"slices"
 	"strconv"
 	"strings"
 
@@ -71,7 +71,7 @@ func GetProtoImports(filepath string) ([]string, error) {
 		}
 	}
 
-	sort.Strings(imports)
+	slices.Sort(imports)
 
 	return imports, nil
 }

language/orion/generate.go

@@ -8,7 +8,6 @@ import (
 	"maps"
 	"path"
 	"slices"
-	"sort"
 	"strings"
 	"sync"
 
@@ -380,7 +379,7 @@ func computeQueriesCacheKey(queries plugin.NamedQueries) string {
 	for key := range queries {
 		keys = append(keys, key)
 	}
-	sort.Strings(keys)
+	slices.Sort(keys)
 
 	e := gob.NewEncoder(cacheDigest)
 	for _, key := range keys {

language/orion/host.go

@@ -10,7 +10,7 @@ import (
 	"os"
 	"path"
 	"path/filepath"
-	"sort"
+	"slices"
 	"strings"
 
 	"github.com/aspect-build/aspect-gazelle/common/bazel/workspace"
@@ -128,7 +128,7 @@ func (h *GazelleHost) loadEnvStarzellePlugins() {
 		}
 
 		// Sort to ensure a consistent order not dependent on the fs or glob ordering.
-		sort.Strings(builtinDirPlugins)
+		slices.Sort(builtinDirPlugins)
 
 		builtinPlugins = append(builtinPlugins, builtinDirPlugins...)
 	}

runner/bin/gazelle/main.go

@@ -96,7 +96,7 @@ func parseArgs() (runner.GazelleCommand, runner.GazelleMode, bool, []string) {
 
 func extractFlag(flag string, defaultValue bool, args []string) (bool, []string) {
 	if i := slices.Index(args, flag); i != -1 {
-		args = append(args[:i], args[i+1:]...)
+		args = slices.Delete(args, i, i+1)
 		return true, args
 	}
 
@@ -118,11 +118,11 @@ func extractArg(flag string, defaultValue string, args []string) (string, []stri
 			return defaultValue, args
 		}
 		value := args[i+1]
-		args = append(args[:i], args[i+2:]...)
+		args = slices.Delete(args, i, i+2)
 		return value, args
 	}
 
 	_, value, _ := strings.Cut(args[i], "=")
-	args = append(args[:i], args[i+1:]...)
+	args = slices.Delete(args, i, i+1)
 	return value, args
 }