diff options
| author | Tobias Klauser <tklauser@distanz.ch> | 2024-10-02 13:00:17 +0200 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2024-10-02 14:22:59 +0000 |
| commit | bb5339196f86057ffa6042d31f52a44bf7f13752 (patch) | |
| tree | 20b17a10fceb171501e121b0ace7d95f532e69cd /src/net/http | |
| parent | e86982c515ba4a494fb1f8e1367f4238a2b59c2e (diff) | |
| download | go-bb5339196f86057ffa6042d31f52a44bf7f13752.tar.xz | |
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 <iant@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Michael Knyszek <mknyszek@google.com>
Auto-Submit: Tobias Klauser <tobias.klauser@gmail.com>
Diffstat (limited to 'src/net/http')
| -rw-r--r-- | src/net/http/cgi/cgi_main.go | 15 | ||||
| -rw-r--r-- | src/net/http/clientserver_test.go | 8 |
2 files changed, 5 insertions, 18 deletions
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]) } diff --git a/src/net/http/clientserver_test.go b/src/net/http/clientserver_test.go index 0c2142a063..3734e28afb 100644 --- a/src/net/http/clientserver_test.go +++ b/src/net/http/clientserver_test.go @@ -17,6 +17,7 @@ import ( "hash" "io" "log" + "maps" "net" . "net/http" "net/http/httptest" @@ -689,12 +690,6 @@ func testCancelRequestMidBody(t *testing.T, mode testMode) { func TestTrailersClientToServer(t *testing.T) { run(t, testTrailersClientToServer) } func testTrailersClientToServer(t *testing.T, mode testMode) { cst := newClientServerTest(t, mode, HandlerFunc(func(w ResponseWriter, r *Request) { - var decl []string - for k := range r.Trailer { - decl = append(decl, k) - } - slices.Sort(decl) - slurp, err := io.ReadAll(r.Body) if err != nil { t.Errorf("Server reading request body: %v", err) @@ -705,6 +700,7 @@ func testTrailersClientToServer(t *testing.T, mode testMode) { if r.Trailer == nil { io.WriteString(w, "nil Trailer") } else { + decl := slices.Sorted(maps.Keys(r.Trailer)) fmt.Fprintf(w, "decl: %v, vals: %s, %s", decl, r.Trailer.Get("Client-Trailer-A"), |