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/net/http/cgi/cgi_main.go | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'src/net/http/cgi') diff --git a/src/net/http/cgi/cgi_main.go b/src/net/http/cgi/cgi_main.go index 033036d07f..1435f1b779 100644 --- a/src/net/http/cgi/cgi_main.go +++ b/src/net/http/cgi/cgi_main.go @@ -7,6 +7,7 @@ package cgi import ( "fmt" "io" + "maps" "net/http" "os" "path" @@ -63,22 +64,12 @@ func testCGI() { fmt.Printf("test=Hello CGI\r\n") - keys := make([]string, 0, len(params)) - for k := range params { - keys = append(keys, k) - } - slices.Sort(keys) - for _, key := range keys { + for _, key := range slices.Sorted(maps.Keys(params)) { fmt.Printf("param-%s=%s\r\n", key, params.Get(key)) } envs := envMap(os.Environ()) - keys = make([]string, 0, len(envs)) - for k := range envs { - keys = append(keys, k) - } - slices.Sort(keys) - for _, key := range keys { + for _, key := range slices.Sorted(maps.Keys(envs)) { fmt.Printf("env-%s=%s\r\n", key, envs[key]) } -- cgit v1.3-6-g1900