all: fix %q verb uses with wrong type
Caught early by the improved vet check gated behind the 1.26 language
version combined with a tiplang builder that tests with 1.26 language
version.
Change-Id: Ie83a8c4311d7dc8fb61178f873cb1135c11e7a70
Cq-Include-Trybots: luci.golang.try:x_build-gotip-linux-amd64-tiplang
Reviewed-on: https://go-review.googlesource.com/c/build/+/725080
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Auto-Submit: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Alan Donovan <adonovan@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
diff --git a/cmd/coordinator/modproxy_test.go b/cmd/coordinator/modproxy_test.go
index 1241861..edc60fa 100644
--- a/cmd/coordinator/modproxy_test.go
+++ b/cmd/coordinator/modproxy_test.go
@@ -48,7 +48,7 @@
got := rr.Result()
gotBody := rr.Body.String()
if got.StatusCode != 200 {
- t.Errorf("status = %q; want 200", got.StatusCode)
+ t.Errorf("status = %d; want 200", got.StatusCode)
}
if gotBody != content {
t.Errorf("content = %q; want %q", gotBody, content)
diff --git a/internal/secret/gcp_secret_manager_test.go b/internal/secret/gcp_secret_manager_test.go
index 14353ff..7c7e0bb 100644
--- a/internal/secret/gcp_secret_manager_test.go
+++ b/internal/secret/gcp_secret_manager_test.go
@@ -228,7 +228,7 @@
t.Fatalf("flag parsing failed: %v", err)
}
if !reflect.DeepEqual(value, tt.wantValue) {
- t.Errorf("flag value = %q, want %q", value, tt.wantValue)
+ t.Errorf("flag value = %#v, want %#v", value, tt.wantValue)
}
})
}
diff --git a/internal/task/fakes.go b/internal/task/fakes.go
index adbd87b..e64233f 100644
--- a/internal/task/fakes.go
+++ b/internal/task/fakes.go
@@ -1213,7 +1213,7 @@
result, ok := c.results[id]
c.mu.Unlock()
if !ok {
- return "", false, fmt.Errorf("unknown task ID %q", id)
+ return "", false, fmt.Errorf("unknown task ID %d", id)
}
return "here's some build detail", true, result
}
diff --git a/internal/task/releasegopls.go b/internal/task/releasegopls.go
index 3b7b5d9..13294f9 100644
--- a/internal/task/releasegopls.go
+++ b/internal/task/releasegopls.go
@@ -573,7 +573,7 @@
pre, err := strconv.Atoi(parts[1])
if err != nil {
- return 0, fmt.Errorf("failed to convert pre-release version to int %q: %w", pre, err)
+ return 0, fmt.Errorf("failed to convert pre-release version %q to int: %w", parts[1], err)
}
if pre <= 0 {
