all: stop using fmt.Sprintf in t.Error/t.Fatal

Change-Id: Id63e1e5ae7e225e4a6a721673bf2d43b6c398c25
Reviewed-on: https://go-review.googlesource.com/c/go/+/527701
Reviewed-by: Ian Lance Taylor <iant@google.com>
Auto-Submit: Ian Lance Taylor <iant@google.com>
Reviewed-by: Bryan Mills <bcmills@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Ian Lance Taylor <iant@google.com>

diff --git a/src/cmd/internal/obj/ppc64/asm_test.go b/src/cmd/internal/obj/ppc64/asm_test.go
index b8995dc7e1d1abc9437a29e0b714fba084ec2880..433df5c8aad75b2394c223645ebeae503780874a 100644 (file)
--- a/src/cmd/internal/obj/ppc64/asm_test.go
+++ b/src/cmd/internal/obj/ppc64/asm_test.go
@@ -198,11 +198,11 @@ func TestPfxAlign(t *testing.T) {
                        t.Errorf("Failed to compile %v: %v\n", pgm, err)
                }
                if !strings.Contains(string(out), pgm.align) {
-                       t.Errorf(fmt.Sprintf("Fatal, misaligned text with prefixed instructions:\n%s\n", string(out)))
+                       t.Errorf("Fatal, misaligned text with prefixed instructions:\n%s", out)
                }
                hasNop := strings.Contains(string(out), "00 00 00 60")
                if hasNop != pgm.hasNop {
-                       t.Errorf(fmt.Sprintf("Fatal, prefixed instruction is missing nop padding:\n%s\n", string(out)))
+                       t.Errorf("Fatal, prefixed instruction is missing nop padding:\n%s", out)
                }
        }
 }

diff --git a/src/context/x_test.go b/src/context/x_test.go
index e006e53470f2e7f7ed18e87809842d3513b66ada..b1012fad8758a405121149d7e5c36eaef227ee39 100644 (file)
--- a/src/context/x_test.go
+++ b/src/context/x_test.go
@@ -408,8 +408,9 @@ func testLayers(t *testing.T, seed int64, testTimeout bool) {
        t.Parallel()
 
        r := rand.New(rand.NewSource(seed))
+       prefix := fmt.Sprintf("seed=%d", seed)
        errorf := func(format string, a ...any) {
-               t.Errorf(fmt.Sprintf("seed=%d: %s", seed, format), a...)
+               t.Errorf(prefix+format, a...)
        }
        const (
                minLayers = 30

diff --git a/src/runtime/defer_test.go b/src/runtime/defer_test.go
index 3a54951c318a58744735a1e4958d02b289f5fe2a..d73202ae6a01091116d06a8a861cd8bd508b5729 100644 (file)
--- a/src/runtime/defer_test.go
+++ b/src/runtime/defer_test.go
@@ -5,7 +5,6 @@
 package runtime_test
 
 import (
-       "fmt"
        "reflect"
        "runtime"
        "testing"
@@ -85,7 +84,7 @@ func TestConditionalDefers(t *testing.T) {
                }
                want := []int{4, 2, 1}
                if !reflect.DeepEqual(want, list) {
-                       t.Fatal(fmt.Sprintf("wanted %v, got %v", want, list))
+                       t.Fatalf("wanted %v, got %v", want, list)
                }
 
        }()
@@ -133,13 +132,13 @@ func TestAbortedPanic(t *testing.T) {
        defer func() {
                r := recover()
                if r != nil {
-                       t.Fatal(fmt.Sprintf("wanted nil recover, got %v", r))
+                       t.Fatalf("wanted nil recover, got %v", r)
                }
        }()
        defer func() {
                r := recover()
                if r != "panic2" {
-                       t.Fatal(fmt.Sprintf("wanted %v, got %v", "panic2", r))
+                       t.Fatalf("wanted %v, got %v", "panic2", r)
                }
        }()
        defer func() {
@@ -156,7 +155,7 @@ func TestRecoverMatching(t *testing.T) {
        defer func() {
                r := recover()
                if r != "panic1" {
-                       t.Fatal(fmt.Sprintf("wanted %v, got %v", "panic1", r))
+                       t.Fatalf("wanted %v, got %v", "panic1", r)
                }
        }()
        defer func() {
@@ -166,7 +165,7 @@ func TestRecoverMatching(t *testing.T) {
                        // not directly called by the panic.
                        r := recover()
                        if r != nil {
-                               t.Fatal(fmt.Sprintf("wanted nil recover, got %v", r))
+                               t.Fatalf("wanted nil recover, got %v", r)
                        }
                }()
        }()
@@ -213,25 +212,25 @@ func TestNonSSAableArgs(t *testing.T) {
 
        defer func() {
                if globint1 != 1 {
-                       t.Fatal(fmt.Sprintf("globint1:  wanted: 1, got %v", globint1))
+                       t.Fatalf("globint1:  wanted: 1, got %v", globint1)
                }
                if save1 != 5 {
-                       t.Fatal(fmt.Sprintf("save1:  wanted: 5, got %v", save1))
+                       t.Fatalf("save1:  wanted: 5, got %v", save1)
                }
                if globint2 != 1 {
-                       t.Fatal(fmt.Sprintf("globint2:  wanted: 1, got %v", globint2))
+                       t.Fatalf("globint2:  wanted: 1, got %v", globint2)
                }
                if save2 != 2 {
-                       t.Fatal(fmt.Sprintf("save2:  wanted: 2, got %v", save2))
+                       t.Fatalf("save2:  wanted: 2, got %v", save2)
                }
                if save3 != 4 {
-                       t.Fatal(fmt.Sprintf("save3:  wanted: 4, got %v", save3))
+                       t.Fatalf("save3:  wanted: 4, got %v", save3)
                }
                if globint3 != 1 {
-                       t.Fatal(fmt.Sprintf("globint3:  wanted: 1, got %v", globint3))
+                       t.Fatalf("globint3:  wanted: 1, got %v", globint3)
                }
                if save4 != 4 {
-                       t.Fatal(fmt.Sprintf("save1:  wanted: 4, got %v", save4))
+                       t.Fatalf("save1:  wanted: 4, got %v", save4)
                }
        }()
 
@@ -264,7 +263,7 @@ func TestDeferForFuncWithNoExit(t *testing.T) {
        cond := 1
        defer func() {
                if cond != 2 {
-                       t.Fatal(fmt.Sprintf("cond: wanted 2, got %v", cond))
+                       t.Fatalf("cond: wanted 2, got %v", cond)
                }
                if recover() != "Test panic" {
                        t.Fatal("Didn't find expected panic")