aboutsummaryrefslogtreecommitdiff
path: root/src/cmd/fix
diff options
context:
space:
mode:
authorBryan C. Mills <bcmills@google.com>2019-11-18 09:54:45 -0500
committerBryan C. Mills <bcmills@google.com>2019-11-18 15:11:03 +0000
commit0ac8739ad5394c3fe0420cf53232954fefb2418f (patch)
tree2e97c5e3106e0aa0071e5203135c77d5b0bb3d82 /src/cmd/fix
parentafac2c0508208ce0baf0cf2f0ba9b86ee7b60469 (diff)
downloadgo-0ac8739ad5394c3fe0420cf53232954fefb2418f.tar.gz
go-0ac8739ad5394c3fe0420cf53232954fefb2418f.zip
cmd/fix: eliminate data races in TestRewrite and gofmt
Fixes #35632 Change-Id: I55c3d53c2a6240868ec001866047a15ec8f91809 Reviewed-on: https://go-review.googlesource.com/c/go/+/207603 Run-TryBot: Bryan C. Mills <bcmills@google.com> Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org>
Diffstat (limited to 'src/cmd/fix')
-rw-r--r--src/cmd/fix/main.go4
-rw-r--r--src/cmd/fix/main_test.go1
2 files changed, 2 insertions, 3 deletions
diff --git a/src/cmd/fix/main.go b/src/cmd/fix/main.go
index 80b3c76350..e72c66398f 100644
--- a/src/cmd/fix/main.go
+++ b/src/cmd/fix/main.go
@@ -203,10 +203,8 @@ func processFile(filename string, useStdin bool) error {
return ioutil.WriteFile(f.Name(), newSrc, 0)
}
-var gofmtBuf bytes.Buffer
-
func gofmt(n interface{}) string {
- gofmtBuf.Reset()
+ var gofmtBuf bytes.Buffer
if err := format.Node(&gofmtBuf, fset, n); err != nil {
return "<" + err.Error() + ">"
}
diff --git a/src/cmd/fix/main_test.go b/src/cmd/fix/main_test.go
index ee74f24c6e..af16bcaa31 100644
--- a/src/cmd/fix/main_test.go
+++ b/src/cmd/fix/main_test.go
@@ -76,6 +76,7 @@ func parseFixPrint(t *testing.T, fn func(*ast.File) bool, desc, in string, mustB
func TestRewrite(t *testing.T) {
for _, tt := range testCases {
+ tt := tt
t.Run(tt.Name, func(t *testing.T) {
t.Parallel()
// Apply fix: should get tt.Out.