From b1780e06a098bf085273a6a5265c55210ecbdbe9 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Tue, 1 Sep 2026 13:29:35 +0200
Subject: [PATCH] opts: modernize with slices and maps packages

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 opts/capabilities.go |  9 ++++++---
 opts/ulimit.go       | 20 ++++++++++----------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/opts/capabilities.go b/opts/capabilities.go
index 82d071853b..96a0e7d0f4 100644
--- a/opts/capabilities.go
+++ b/opts/capabilities.go
@@ -1,7 +1,10 @@
+// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
+//go:build go1.26
+
 package opts
 
 import (
-	"sort"
+	"slices"
 	"strings"
 )
 
@@ -82,8 +85,8 @@ func EffectiveCapAddCapDrop(add, drop []string) (capAdd, capDrop []string) {
 		}
 	}
 
-	sort.Strings(capAdd)
-	sort.Strings(capDrop)
+	slices.Sort(capAdd)
+	slices.Sort(capDrop)
 
 	return capAdd, capDrop
 }
diff --git a/opts/ulimit.go b/opts/ulimit.go
index aa88bce71a..ba4a82c9d8 100644
--- a/opts/ulimit.go
+++ b/opts/ulimit.go
@@ -1,8 +1,13 @@
+// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
+//go:build go1.26
+
 package opts
 
 import (
 	"fmt"
-	"sort"
+	"maps"
+	"slices"
+	"strings"
 
 	"github.com/docker/go-units"
 	"github.com/moby/moby/api/types/container"
@@ -41,20 +46,15 @@ func (o *UlimitOpt) String() string {
 	for _, v := range *o.values {
 		out = append(out, v.String())
 	}
-	sort.Strings(out)
-	return fmt.Sprintf("%v", out)
+	slices.Sort(out)
+	return fmt.Sprint(out)
 }
 
 // GetList returns a slice of pointers to Ulimits. Values are sorted by name.
 func (o *UlimitOpt) GetList() []*container.Ulimit {
-	ulimits := make([]*container.Ulimit, 0, len(*o.values))
-	for _, v := range *o.values {
-		ulimits = append(ulimits, v)
-	}
-	sort.SliceStable(ulimits, func(i, j int) bool {
-		return ulimits[i].Name < ulimits[j].Name
+	return slices.SortedFunc(maps.Values(*o.values), func(a, b *container.Ulimit) int {
+		return strings.Compare(a.Name, b.Name)
 	})
-	return ulimits
 }
 
 // Type returns the option type