diff options
| author | Jes Cok <xigua67damn@gmail.com> | 2024-09-11 15:48:56 +0000 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2024-09-11 18:05:46 +0000 |
| commit | 1dfb33e8612d20f41cf4e034d9d0838abf75e04b (patch) | |
| tree | 04cb48f0dca6d0c5caf243ee1b992201ac6ec646 /src | |
| parent | 2d9255b0eae02861ccae38e54c174624138c1693 (diff) | |
| download | go-1dfb33e8612d20f41cf4e034d9d0838abf75e04b.tar.xz | |
html/template: use maps.Copy in escaper.escapeListConditionally
To make it a little simpler.
Change-Id: I0d7f015e8f245fbdd8c5cf5c10e8d2bd44b91021
GitHub-Last-Rev: 2eae47fe8bc5704de86a91ac87c76e49f51d2fe7
GitHub-Pull-Request: golang/go#69396
Reviewed-on: https://go-review.googlesource.com/c/go/+/612397
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Auto-Submit: Ian Lance Taylor <iant@google.com>
Reviewed-by: Tim King <taking@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/html/template/escape.go | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/html/template/escape.go b/src/html/template/escape.go index 5ab41b0ce9..1f963e61b4 100644 --- a/src/html/template/escape.go +++ b/src/html/template/escape.go @@ -10,6 +10,7 @@ import ( "html" "internal/godebug" "io" + "maps" "regexp" "text/template" "text/template/parse" @@ -588,22 +589,14 @@ func (e *escaper) escapeListConditionally(c context, n *parse.ListNode, filter f e1 := makeEscaper(e.ns) e1.rangeContext = e.rangeContext // Make type inferences available to f. - for k, v := range e.output { - e1.output[k] = v - } + maps.Copy(e1.output, e.output) c = e1.escapeList(c, n) ok := filter != nil && filter(&e1, c) if ok { // Copy inferences and edits from e1 back into e. - for k, v := range e1.output { - e.output[k] = v - } - for k, v := range e1.derived { - e.derived[k] = v - } - for k, v := range e1.called { - e.called[k] = v - } + maps.Copy(e.output, e1.output) + maps.Copy(e.derived, e1.derived) + maps.Copy(e.called, e1.called) for k, v := range e1.actionNodeEdits { e.editActionNode(k, v) } |