encoding/json: don't reset before returning buffer to pool

andig · mvdan · commit cf630586ca59 · 2019-09-10T14:58:40.000Z
Reset is already performed when retrieving from pool Change-Id: Ia810dd18d3e55a1565a5ad435a00d1e46724576c GitHub-Last-Rev: d9df74a GitHub-Pull-Request: #34195 Reviewed-on: https://go-review.googlesource.com/c/go/+/194338 Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Daniel Martí <mvdan@mvdan.cc>
diff --git a/src/encoding/json/encode.go b/src/encoding/json/encode.go
@@ -164,7 +164,6 @@ func Marshal(v interface{}) ([]byte, error) {
 	}
 	buf := append([]byte(nil), e.Bytes()...)
 
-	e.Reset()
 	encodeStatePool.Put(e)
 
 	return buf, nil

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,6 @@ func Marshal(v interface{}) ([]byte, error) {`
`164`	`164`	`}`
`165`	`165`	`buf := append([]byte(nil), e.Bytes()...)`
`166`	`166`
`167`		`- e.Reset()`
`168`	`167`	`encodeStatePool.Put(e)`
`169`	`168`
`170`	`169`	`return buf, nil`