all: fix printf(var) mistakes detected by latest printf checker
The CodeWriter.WriteComment method is odd. It calls fmt.Sprintf
on its arguments so the caller doesn't need to, but isn't named
something like WriteCommentf as I'd expect. I tried renaming it,
but it became a bigger change than I wanted. Leaving that for a
future CL - this one just fixes clear mistakes to fix the build.
For golang/go#69267.
Change-Id: Ifba42d4512696194fbf21d6c8d3da76440b1ce9e
Reviewed-on: https://go-review.googlesource.com/c/text/+/610676
Reviewed-by: Tim King <taking@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Auto-Submit: Dmitri Shuralyov <dmitshur@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
diff --git a/collate/build/builder_test.go b/collate/build/builder_test.go
index ff0aba3..0e022ec 100644
--- a/collate/build/builder_test.go
+++ b/collate/build/builder_test.go
@@ -65,7 +65,7 @@
ces = append(ces, ce.w)
}
if err := b.Add([]rune(e.str), ces, nil); err != nil {
- t.Errorf(err.Error())
+ t.Error(err)
}
}
b.t = &table{}
diff --git a/collate/build/trie_test.go b/collate/build/trie_test.go
index 4d4f6e4..5109e09 100644
--- a/collate/build/trie_test.go
+++ b/collate/build/trie_test.go
@@ -29,7 +29,7 @@
idx.addTrie(n)
tr, err := idx.generate()
if err != nil {
- t.Errorf(err.Error())
+ t.Error(err)
}
return *tr
}
diff --git a/internal/cldrtree/generate.go b/internal/cldrtree/generate.go
index 0f0b5f3..bdd77ce 100644
--- a/internal/cldrtree/generate.go
+++ b/internal/cldrtree/generate.go
@@ -21,7 +21,7 @@
fmt.Fprintf(w, "var tree = &cldrtree.Tree{locales, indices, buckets}\n\n")
- w.WriteComment("Path values:\n" + b.stats())
+ w.WriteComment("Path values:\n%s", b.stats())
fmt.Fprintln(w)
// Generate enum types.
diff --git a/internal/gen/code.go b/internal/gen/code.go
index 75435c9..fa4002b 100644
--- a/internal/gen/code.go
+++ b/internal/gen/code.go
@@ -342,8 +342,7 @@
if !reflect.DeepEqual(zero, x) {
line := fmt.Sprintf("%#v,\n", x)
line = line[strings.IndexByte(line, '{'):]
- w.printf("%d: ", i)
- w.printf(line)
+ w.printf("%d: %s", i, line)
}
}
case reflect.Array:
