[tools] Fix format string errors
Fixes cases in Go code where Printf, Fprintf, Errorf, etc. were being
called with non-constant format strings. In most cases, this was due
to the wrong function being used since formatting was not actually
needed.
These errors appear to have been around for a long time, but a change
in the Go version or something caused these to start causing test
failures.
Change-Id: Ie329a939183d6274d99b945b0bedab4a3bcf8938
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/221054
Reviewed-by: dan sinclair <dsinclair@chromium.org>
Commit-Queue: dan sinclair <dsinclair@chromium.org>
Auto-Submit: Brian Sheedy <bsheedy@google.com>
diff --git a/tools/src/bench/bench.go b/tools/src/bench/bench.go
index 47776c5..4f442a4 100644
--- a/tools/src/bench/bench.go
+++ b/tools/src/bench/bench.go
@@ -123,11 +123,11 @@
}
matches := consoleLineRE.FindStringSubmatch(line)
if len(matches) != 4 {
- return Run{}, fmt.Errorf("Unable to parse the line:\n" + line)
+ return Run{}, fmt.Errorf("Unable to parse the line:\n%s", line)
}
ns, err := strconv.ParseFloat(matches[2], 64)
if err != nil {
- return Run{}, fmt.Errorf("Unable to parse the duration: " + matches[2])
+ return Run{}, fmt.Errorf("Unable to parse the duration: %s", matches[2])
}
b = append(b, Benchmark{
diff --git a/tools/src/cmd/gen/build/build.go b/tools/src/cmd/gen/build/build.go
index a408148..032c3a3 100644
--- a/tools/src/cmd/gen/build/build.go
+++ b/tools/src/cmd/gen/build/build.go
@@ -562,7 +562,7 @@
for _, include := range route {
fmt.Fprintf(&err, " %v:%v includes '%v'\n", include.file, include.inc.Line, include.inc.Path)
}
- return fmt.Errorf(err.String())
+ return fmt.Errorf("%s", err.String())
}
return nil
}
@@ -605,7 +605,7 @@
fmt.Fprintln(&err, " ", string(t))
}
fmt.Fprintln(&err, " ", string(t.Name))
- return fmt.Errorf(err.String())
+ return fmt.Errorf("%s", err.String())
}
return nil
}
diff --git a/tools/src/cmd/get-test-plan/main.go b/tools/src/cmd/get-test-plan/main.go
index 06668ff..98f1deb 100644
--- a/tools/src/cmd/get-test-plan/main.go
+++ b/tools/src/cmd/get-test-plan/main.go
@@ -798,7 +798,7 @@
testName = id + ",rule" + strconv.Itoa(globalRuleCounter)
if testNamesSet[testName] {
testName = "error-unable-to-generate-unique-file-name"
- return testName, "", fmt.Errorf("unable to generate unique test name\n" + desc)
+ return testName, "", fmt.Errorf("unable to generate unique test name\n%s", desc)
}
testNamesSet[testName] = true
return testName, "", nil
diff --git a/tools/src/cmd/tests/main.go b/tools/src/cmd/tests/main.go
index e4cc081..40fa2cd 100644
--- a/tools/src/cmd/tests/main.go
+++ b/tools/src/cmd/tests/main.go
@@ -285,7 +285,7 @@
color.Unset()
fmt.Printf(" validation ")
if *tool.path != "" {
- fmt.Printf("ENABLED (" + *tool.path + ")")
+ fmt.Printf("ENABLED (%s)", *tool.path)
} else {
color.Set(color.FgRed)
fmt.Printf("DISABLED")
@@ -411,20 +411,20 @@
cyan := color.New(color.FgCyan)
printFormatsHeader := func() {
- fmt.Printf(strings.Repeat(" ", filenameColumnWidth))
- fmt.Printf(" ┃ ")
+ fmt.Print(strings.Repeat(" ", filenameColumnWidth))
+ fmt.Print(" ┃ ")
for _, format := range formats {
- cyan.Printf(alignCenter(format, formatWidth(format)))
- fmt.Printf(" │ ")
+ cyan.Print(alignCenter(format, formatWidth(format)))
+ fmt.Print(" │ ")
}
fmt.Println()
}
printHorizontalLine := func() {
- fmt.Printf(strings.Repeat("━", filenameColumnWidth))
- fmt.Printf("━╋━")
+ fmt.Print(strings.Repeat("━", filenameColumnWidth))
+ fmt.Print("━╋━")
for _, format := range formats {
- fmt.Printf(strings.Repeat("━", formatWidth(format)))
- fmt.Printf("━┿━")
+ fmt.Print(strings.Repeat("━", formatWidth(format)))
+ fmt.Print("━┿━")
}
fmt.Println()
}
@@ -449,8 +449,8 @@
shortFile = "..." + file[filenameLength-filenameColumnWidth+3:]
}
- fmt.Fprintf(row, alignRight(shortFile, filenameColumnWidth))
- fmt.Fprintf(row, " ┃ ")
+ fmt.Fprint(row, alignRight(shortFile, filenameColumnWidth))
+ fmt.Fprint(row, " ┃ ")
for _, format := range formats {
columnWidth := formatWidth(format)
result := <-results[format]
@@ -470,25 +470,25 @@
switch result.code {
case pass:
- green.Fprintf(row, alignCenter("PASS", columnWidth))
+ green.Fprint(row, alignCenter("PASS", columnWidth))
stats.numPass++
case fail:
- red.Fprintf(row, alignCenter("FAIL", columnWidth))
+ red.Fprint(row, alignCenter("FAIL", columnWidth))
rowAllPassed = false
stats.numFail++
case skip:
- yellow.Fprintf(row, alignCenter("SKIP", columnWidth))
+ yellow.Fprint(row, alignCenter("SKIP", columnWidth))
rowAllPassed = false
stats.numSkip++
case invalid:
- yellow.Fprintf(row, alignCenter("INVALID", columnWidth))
+ yellow.Fprint(row, alignCenter("INVALID", columnWidth))
rowAllPassed = false
stats.numInvalid++
default:
- fmt.Fprintf(row, alignCenter(result.code, columnWidth))
+ fmt.Fprint(row, alignCenter(result.code, columnWidth))
rowAllPassed = false
}
- fmt.Fprintf(row, " │ ")
+ fmt.Fprint(row, " │ ")
}
if verbose || !rowAllPassed {
@@ -517,23 +517,23 @@
columnWidth := formatWidth(format)
count := num(statsByFmt[format])
if count > 0 {
- col.Fprintf(row, alignLeft(count, columnWidth))
+ col.Fprint(row, alignLeft(count, columnWidth))
anyNonZero = true
} else {
- fmt.Fprintf(row, alignLeft(count, columnWidth))
+ fmt.Fprint(row, alignLeft(count, columnWidth))
}
- fmt.Fprintf(row, " │ ")
+ fmt.Fprint(row, " │ ")
}
if !anyNonZero {
return
}
- col.Printf(alignRight(name, filenameColumnWidth))
- fmt.Printf(" ┃ ")
+ col.Print(alignRight(name, filenameColumnWidth))
+ fmt.Print(" ┃ ")
fmt.Fprintln(color.Output, row)
- col.Printf(strings.Repeat(" ", filenameColumnWidth))
- fmt.Printf(" ┃ ")
+ col.Print(strings.Repeat(" ", filenameColumnWidth))
+ fmt.Print(" ┃ ")
for _, format := range formats {
columnWidth := formatWidth(format)
stats := statsByFmt[format]
@@ -544,7 +544,7 @@
} else {
fmt.Print(alignRight(percent, columnWidth))
}
- fmt.Printf(" │ ")
+ fmt.Print(" │ ")
}
fmt.Println()
}
@@ -553,12 +553,12 @@
printStat(yellow, "INVALID", func(s *stats) int { return s.numInvalid })
printStat(red, "FAIL", func(s *stats) int { return s.numFail })
- cyan.Printf(alignRight("TIME", filenameColumnWidth))
- fmt.Printf(" ┃ ")
+ cyan.Print(alignRight("TIME", filenameColumnWidth))
+ fmt.Print(" ┃ ")
for _, format := range formats {
timeTaken := printDuration(statsByFmt[format].timeTaken)
- cyan.Printf(alignLeft(timeTaken, formatWidth(format)))
- fmt.Printf(" │ ")
+ cyan.Print(alignLeft(timeTaken, formatWidth(format)))
+ fmt.Print(" │ ")
}
fmt.Println()
