From bb5339196f86057ffa6042d31f52a44bf7f13752 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Wed, 2 Oct 2024 13:00:17 +0200 Subject: all: use slices.Sorted(maps.Keys(m)) Use slices.Sorted(maps.Keys(m)) to get a sorted slices of the keys in a map. Do not change packages built during bootstrap, as the bootstrap compiler (currently 1.22.6) does not have the required maps and slices functions. Change-Id: Ie35565d241fa14aca56b730a69af010127b659ab Reviewed-on: https://go-review.googlesource.com/c/go/+/617356 Reviewed-by: Ian Lance Taylor LUCI-TryBot-Result: Go LUCI Reviewed-by: Michael Knyszek Auto-Submit: Tobias Klauser --- src/database/sql/sql.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/database/sql') diff --git a/src/database/sql/sql.go b/src/database/sql/sql.go index c247a9b506..b7cf3d12fa 100644 --- a/src/database/sql/sql.go +++ b/src/database/sql/sql.go @@ -21,6 +21,7 @@ import ( "errors" "fmt" "io" + "maps" "math/rand/v2" "reflect" "runtime" @@ -75,12 +76,7 @@ func unregisterAllDrivers() { func Drivers() []string { driversMu.RLock() defer driversMu.RUnlock() - list := make([]string, 0, len(drivers)) - for name := range drivers { - list = append(list, name) - } - slices.Sort(list) - return list + return slices.Sorted(maps.Keys(drivers)) } // A NamedArg is a named argument. NamedArg values may be used as -- cgit v1.3