all: use strings.Builder where appropriate

Change-Id: I164d350ca480640996055dedf38d962921c474a6
Reviewed-on: https://go-review.googlesource.com/c/go/+/435975
Run-TryBot: Ian Lance Taylor <iant@google.com>
Auto-Submit: Ian Lance Taylor <iant@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Run-TryBot: hopehook <hopehook@golangcn.org>
TryBot-Result: Gopher Robot <gobot@golang.org>

diff --git a/src/encoding/pem/pem_test.go b/src/encoding/pem/pem_test.go
index c94b5ca53b56887d6258f89b65d8459649c7e8ce..56a7754b220c647c7c427987bfd941da4335e676 100644 (file)
--- a/src/encoding/pem/pem_test.go
+++ b/src/encoding/pem/pem_test.go
@@ -192,7 +192,7 @@ var lineBreakerTests = []lineBreakerTest{
 
 func TestLineBreaker(t *testing.T) {
        for i, test := range lineBreakerTests {
-               buf := new(bytes.Buffer)
+               buf := new(strings.Builder)
                var breaker lineBreaker
                breaker.out = buf
                _, err := breaker.Write([]byte(test.in))
@@ -206,13 +206,13 @@ func TestLineBreaker(t *testing.T) {
                        continue
                }
 
-               if string(buf.Bytes()) != test.out {
-                       t.Errorf("#%d: got:%s want:%s", i, string(buf.Bytes()), test.out)
+               if got := buf.String(); got != test.out {
+                       t.Errorf("#%d: got:%s want:%s", i, got, test.out)
                }
        }
 
        for i, test := range lineBreakerTests {
-               buf := new(bytes.Buffer)
+               buf := new(strings.Builder)
                var breaker lineBreaker
                breaker.out = buf
 
@@ -229,8 +229,8 @@ func TestLineBreaker(t *testing.T) {
                        continue
                }
 
-               if string(buf.Bytes()) != test.out {
-                       t.Errorf("#%d: (byte by byte) got:%s want:%s", i, string(buf.Bytes()), test.out)
+               if got := buf.String(); got != test.out {
+                       t.Errorf("#%d: (byte by byte) got:%s want:%s", i, got, test.out)
                }
        }
 }

diff --git a/src/os/signal/signal_windows_test.go b/src/os/signal/signal_windows_test.go
index 9b145515726c7ec820dbe2a0f151a2ce1f6c0981..02803e5808091ea123d82f165174bfb7e34725fc 100644 (file)
--- a/src/os/signal/signal_windows_test.go
+++ b/src/os/signal/signal_windows_test.go
@@ -5,11 +5,11 @@
 package signal
 
 import (
-       "bytes"
        "internal/testenv"
        "os"
        "os/exec"
        "path/filepath"
+       "strings"
        "syscall"
        "testing"
        "time"
@@ -78,9 +78,9 @@ func main() {
 
        // run it
        cmd := exec.Command(exe)
-       var b bytes.Buffer
-       cmd.Stdout = &b
-       cmd.Stderr = &b
+       var buf strings.Builder
+       cmd.Stdout = &buf
+       cmd.Stderr = &buf
        cmd.SysProcAttr = &syscall.SysProcAttr{
                CreationFlags: syscall.CREATE_NEW_PROCESS_GROUP,
        }
@@ -94,6 +94,6 @@ func main() {
        }()
        err = cmd.Wait()
        if err != nil {
-               t.Fatalf("Program exited with error: %v\n%v", err, string(b.Bytes()))
+               t.Fatalf("Program exited with error: %v\n%v", err, buf.String())
        }
 }

diff --git a/src/runtime/syscall_windows_test.go b/src/runtime/syscall_windows_test.go
index 37f8f40cfba730a8724c7ff277174be56328852e..c0d3379e65ad6a7bd7664c72a41a035aabe9574f 100644 (file)
--- a/src/runtime/syscall_windows_test.go
+++ b/src/runtime/syscall_windows_test.go
@@ -5,7 +5,6 @@
 package runtime_test
 
 import (
-       "bytes"
        "fmt"
        "internal/abi"
        "internal/syscall/windows/sysdll"
@@ -1044,7 +1043,7 @@ func TestNumCPU(t *testing.T) {
 
        cmd := exec.Command(os.Args[0], "-test.run=TestNumCPU")
        cmd.Env = append(os.Environ(), "GO_WANT_HELPER_PROCESS=1")
-       var buf bytes.Buffer
+       var buf strings.Builder
        cmd.Stdout = &buf
        cmd.Stderr = &buf
        cmd.SysProcAttr = &syscall.SysProcAttr{CreationFlags: _CREATE_SUSPENDED}
@@ -1054,7 +1053,7 @@ func TestNumCPU(t *testing.T) {
        }
        defer func() {
                err = cmd.Wait()
-               childOutput := string(buf.Bytes())
+               childOutput := buf.String()
                if err != nil {
                        t.Fatalf("child failed: %v: %v", err, childOutput)
                }