commands: slices - backport slices.SortFunc

Author: djdv

internal/commands/mount.go

@@ -7,7 +7,6 @@ import (
 	"flag"
 	"fmt"
 	"io/fs"
-	"slices"
 	"strings"
 
 	"github.com/djdv/go-filesystem-utils/internal/command"
@@ -255,18 +254,6 @@ func makeMountSubcommands() []command.Command {
 	return hosts
 }
 
-func sortCommands(commands []command.Command) {
-	slices.SortFunc(
-		commands,
-		func(a, b command.Command) int {
-			return strings.Compare(
-				a.Name(),
-				b.Name(),
-			)
-		},
-	)
-}
-
 func makeMountSubcommand(host filesystem.Host, guestCommands []command.Command) command.Command {
 	var (
 		formalName  = string(host)

internal/commands/slices_20.go

@@ -0,0 +1,14 @@
+//go:build !go1.21
+
+package commands
+
+import (
+	"github.com/djdv/go-filesystem-utils/internal/command"
+	"golang.org/x/exp/slices"
+)
+
+func sortCommands(commands []command.Command) {
+	slices.SortFunc(commands, func(a, b command.Command) bool {
+		return a.Name() < b.Name()
+	})
+}

internal/commands/slices_21.go

@@ -0,0 +1,22 @@
+//go:build go1.21
+
+package commands
+
+import (
+	"slices"
+	"strings"
+
+	"github.com/djdv/go-filesystem-utils/internal/command"
+)
+
+func sortCommands(commands []command.Command) {
+	slices.SortFunc(
+		commands,
+		func(a, b command.Command) int {
+			return strings.Compare(
+				a.Name(),
+				b.Name(),
+			)
+		},
+	)
+}