Skip to content

Commit f58fe08

Browse files
harp-intelharp-intel
authored
Catch up with latest 'modernize' suggestions and remove 'modernize' from the list of checkers required to pass (#587)
* Catch up with latest 'go modernize' suggestions Signed-off-by: Harper, Jason M <jason.m.harper@intel.com> * remove modernize from list of required passing checkers Signed-off-by: Harper, Jason M <jason.m.harper@intel.com> --------- Signed-off-by: Harper, Jason M <jason.m.harper@intel.com>
1 parent 54bf3cd commit f58fe08

File tree

9 files changed

+32
-31
lines changed

9 files changed

+32
-31
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ modernize:
151151
go run golang.org/x/tools/gopls/internal/analysis/modernize/cmd/modernize@latest -fix -test ./...
152152

153153
.PHONY: check
154-
check: check_format check_vet check_static check_license check_lint check_vuln check_modernize test
154+
check: check_format check_vet check_static check_license check_lint check_vuln test
155155

156156
.PHONY: sweep
157157
sweep:

‎cmd/config/config_tables.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,10 +226,10 @@ func configurationTableTextRenderer(tableValues table.TableValues) string {
226226
value = field.Values[0]
227227
}
228228
// Format: "Field Name: Value Description"
229-
sb.WriteString(fmt.Sprintf("%-*s %-*s %s\n",
229+
fmt.Fprintf(&sb, "%-*s %-*s %s\n",
230230
maxFieldNameLen+1, field.Name+":",
231231
maxValueLen, value,
232-
field.Description))
232+
field.Description)
233233
}
234234

235235
return sb.String()

‎cmd/config/restore.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,8 +380,8 @@ func parseNumericWithUnit(value string, units ...string) (string, error) {
380380

381381
// try to remove each unit suffix
382382
for _, unit := range units {
383-
if strings.HasSuffix(value, unit) {
384-
numStr := strings.TrimSuffix(value, unit)
383+
if before, ok := strings.CutSuffix(value, unit); ok {
384+
numStr := before
385385
// validate it's a valid number
386386
if _, err := strconv.ParseFloat(numStr, 64); err != nil {
387387
return "", fmt.Errorf("invalid numeric value: %s", value)

‎cmd/config/set.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -903,14 +903,15 @@ fi
903903
default:
904904
return fmt.Errorf("invalid C6 setting: %s", enableDisable)
905905
}
906-
bash := "for cpu in /sys/devices/system/cpu/cpu[0-9]*; do\n"
906+
var bash strings.Builder
907+
bash.WriteString("for cpu in /sys/devices/system/cpu/cpu[0-9]*; do\n")
907908
for _, folder := range c6StateFolders {
908-
bash += fmt.Sprintf(" echo %d > $cpu/cpuidle/%s/disable\n", enableDisableValue, folder)
909+
fmt.Fprintf(&bash, " echo %d > $cpu/cpuidle/%s/disable\n", enableDisableValue, folder)
909910
}
910-
bash += "done\n"
911+
bash.WriteString("done\n")
911912
setScript := script.ScriptDefinition{
912913
Name: "configure c6",
913-
ScriptTemplate: bash,
914+
ScriptTemplate: bash.String(),
914915
Superuser: true,
915916
}
916917
_, err = runScript(myTarget, setScript, localTempDir)

‎cmd/flame/flame_tables.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ func (p *ProcessStacks) dumpFolded() (folded string) {
206206
var sb strings.Builder
207207
for processName, stacks := range *p {
208208
for stack, stackCount := range stacks {
209-
sb.WriteString(fmt.Sprintf("%s;%s %d\n", processName, stack, stackCount))
209+
fmt.Fprintf(&sb, "%s;%s %d\n", processName, stack, stackCount)
210210
}
211211
}
212212
folded = sb.String()

‎cmd/metrics/perf_mux.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ func GetMuxIntervals(myTarget target.Target, localTempDir string) (intervals map
3636

3737
// SetMuxIntervals - write the given intervals (values in ms) to the given sysfs device file names (key)
3838
func SetMuxIntervals(myTarget target.Target, intervals map[string]int, localTempDir string) (err error) {
39-
var bash string
39+
var bash strings.Builder
4040
for device := range intervals {
41-
bash += fmt.Sprintf("echo %d > %s; ", intervals[device], device)
41+
fmt.Fprintf(&bash, "echo %d > %s; ", intervals[device], device)
4242
}
43-
_, err = common.RunScript(myTarget, script.ScriptDefinition{Name: "set mux intervals", ScriptTemplate: bash, Superuser: true}, localTempDir, flagNoRoot)
43+
_, err = common.RunScript(myTarget, script.ScriptDefinition{Name: "set mux intervals", ScriptTemplate: bash.String(), Superuser: true}, localTempDir, flagNoRoot)
4444
return
4545
}
4646

‎cmd/telemetry/telemetry_tables.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -873,7 +873,7 @@ func irqRateTelemetryTableHTMLRenderer(tableValues table.TableValues, targetName
873873
// - one scatter chart per drive, showing the drive's utilization over time
874874
// - each drive stat is a separate dataset within the chart
875875
func driveTelemetryTableHTMLRenderer(tableValues table.TableValues, targetName string) string {
876-
var out string
876+
var out strings.Builder
877877
driveStats := make(map[string][][]string)
878878
for i := range tableValues.Fields[0].Values {
879879
drive := tableValues.Fields[1].Values[i]
@@ -922,16 +922,16 @@ func driveTelemetryTableHTMLRenderer(tableValues table.TableValues, targetName s
922922
SuggestedMin: "0",
923923
SuggestedMax: "0",
924924
}
925-
out += telemetryTableHTMLRenderer(tableValues, data, datasetNames, chartConfig, nil)
925+
out.WriteString(telemetryTableHTMLRenderer(tableValues, data, datasetNames, chartConfig, nil))
926926
}
927-
return out
927+
return out.String()
928928
}
929929

930930
// networkTelemetryTableHTMLRenderer renders charts of network device statistics
931931
// - one scatter chart per network device, showing the device's utilization over time
932932
// - each network stat is a separate dataset within the chart
933933
func networkTelemetryTableHTMLRenderer(tableValues table.TableValues, targetName string) string {
934-
var out string
934+
var out strings.Builder
935935
nicStats := make(map[string][][]string)
936936
for i := range tableValues.Fields[0].Values {
937937
drive := tableValues.Fields[1].Values[i]
@@ -980,9 +980,9 @@ func networkTelemetryTableHTMLRenderer(tableValues table.TableValues, targetName
980980
SuggestedMin: "0",
981981
SuggestedMax: "0",
982982
}
983-
out += telemetryTableHTMLRenderer(tableValues, data, datasetNames, chartConfig, nil)
983+
out.WriteString(telemetryTableHTMLRenderer(tableValues, data, datasetNames, chartConfig, nil))
984984
}
985-
return out
985+
return out.String()
986986
}
987987

988988
func memoryTelemetryTableHTMLRenderer(tableValues table.TableValues, targetName string) string {

‎internal/report/render_html.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ func getHtmlReportMenu(allTableValues []table.TableValues) string {
218218
// insert menu items into sidebar
219219
for _, tableValues := range allTableValues {
220220
if tableValues.MenuLabel != "" {
221-
sb.WriteString(fmt.Sprintf("<a href=\"#%s\">%s</a>\n", html.EscapeString(tableValues.Name), html.EscapeString(tableValues.MenuLabel)))
221+
fmt.Fprintf(&sb, "<a href=\"#%s\">%s</a>\n", html.EscapeString(tableValues.Name), html.EscapeString(tableValues.MenuLabel))
222222
}
223223
}
224224
sb.WriteString("</div>\n") // end of sidebar
@@ -273,7 +273,7 @@ func createHtmlReport(allTableValues []table.TableValues, targetName string) (ou
273273
`)
274274
for _, tableValues := range allTableValues {
275275
// print the table name
276-
sb.WriteString(fmt.Sprintf("<h2 id=\"%[1]s\">%[1]s</h2>\n", html.EscapeString(tableValues.Name)))
276+
fmt.Fprintf(&sb, "<h2 id=\"%[1]s\">%[1]s</h2>\n", html.EscapeString(tableValues.Name))
277277
// if there's no data in the table, print a message and continue
278278
if len(tableValues.Fields) == 0 || len(tableValues.Fields[0].Values) == 0 {
279279
msg := NoDataFound
@@ -343,10 +343,10 @@ func createHtmlReportMultiTarget(allTargetsTableValues [][]table.TableValues, ta
343343
if targetTableValues.HasRows && getCustomHTMLMultiTargetRenderer(targetTableValues.Name) == nil {
344344
// print the table name only one time per table
345345
if targetIndex == 0 {
346-
sb.WriteString(fmt.Sprintf("<h2 id=\"%[1]s\">%[1]s</h2>\n", html.EscapeString(targetTableValues.Name)))
346+
fmt.Fprintf(&sb, "<h2 id=\"%[1]s\">%[1]s</h2>\n", html.EscapeString(targetTableValues.Name))
347347
}
348348
// print the target name
349-
sb.WriteString(fmt.Sprintf("<h3>%s</h3>\n", targetName))
349+
fmt.Fprintf(&sb, "<h3>%s</h3>\n", targetName)
350350
// if there's no data in the table, print a message and continue
351351
if len(targetTableValues.Fields) == 0 || len(targetTableValues.Fields[0].Values) == 0 {
352352
sb.WriteString("<p>" + NoDataFound + "</p>\n")
@@ -363,7 +363,7 @@ func createHtmlReportMultiTarget(allTargetsTableValues [][]table.TableValues, ta
363363
}
364364
// print the multi-target table, if any
365365
if len(oneTableValuesForAllTargets) > 0 {
366-
sb.WriteString(fmt.Sprintf("<h2 id=\"%[1]s\">%[1]s</h2>\n", html.EscapeString(oneTableValuesForAllTargets[0].Name)))
366+
fmt.Fprintf(&sb, "<h2 id=\"%[1]s\">%[1]s</h2>\n", html.EscapeString(oneTableValuesForAllTargets[0].Name))
367367
if renderer := getCustomHTMLMultiTargetRenderer(oneTableValuesForAllTargets[0].Name); renderer != nil {
368368
sb.WriteString(renderer(oneTableValuesForAllTargets, targetNames))
369369
} else {

‎internal/report/render_text.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func RegisterTextRenderer(tableName string, renderer table.TextTableRenderer) {
2525
func createTextReport(allTableValues []table.TableValues) (out []byte, err error) {
2626
var sb strings.Builder
2727
for _, tableValues := range allTableValues {
28-
sb.WriteString(fmt.Sprintf("%s\n", tableValues.Name))
28+
fmt.Fprintf(&sb, "%s\n", tableValues.Name)
2929
for range len(tableValues.Name) {
3030
sb.WriteString("=")
3131
}
@@ -72,23 +72,23 @@ func DefaultTextTableRendererFunc(tableValues table.TableValues) string {
7272
columnSpacing := 3
7373
// print the field names
7474
for _, field := range tableValues.Fields {
75-
sb.WriteString(fmt.Sprintf("%-*s", maxFieldLen[field.Name]+columnSpacing, field.Name))
75+
fmt.Fprintf(&sb, "%-*s", maxFieldLen[field.Name]+columnSpacing, field.Name)
7676
}
7777
sb.WriteString("\n")
7878
// underline the field names
7979
for _, field := range tableValues.Fields {
80-
underline := ""
80+
var underline strings.Builder
8181
for range len(field.Name) {
82-
underline += "-"
82+
underline.WriteString("-")
8383
}
84-
sb.WriteString(fmt.Sprintf("%-*s", maxFieldLen[field.Name]+columnSpacing, underline))
84+
fmt.Fprintf(&sb, "%-*s", maxFieldLen[field.Name]+columnSpacing, underline.String())
8585
}
8686
sb.WriteString("\n")
8787
// print the rows
8888
numRows := len(tableValues.Fields[0].Values)
8989
for row := range numRows {
9090
for fieldIdx, field := range tableValues.Fields {
91-
sb.WriteString(fmt.Sprintf("%-*s", maxFieldLen[field.Name]+columnSpacing, tableValues.Fields[fieldIdx].Values[row]))
91+
fmt.Fprintf(&sb, "%-*s", maxFieldLen[field.Name]+columnSpacing, tableValues.Fields[fieldIdx].Values[row])
9292
}
9393
sb.WriteString("\n")
9494
}
@@ -106,7 +106,7 @@ func DefaultTextTableRendererFunc(tableValues table.TableValues) string {
106106
if len(field.Values) > 0 {
107107
value = field.Values[0]
108108
}
109-
sb.WriteString(fmt.Sprintf("%s%-*s %s\n", field.Name, maxFieldNameLen-len(field.Name)+1, ":", value))
109+
fmt.Fprintf(&sb, "%s%-*s %s\n", field.Name, maxFieldNameLen-len(field.Name)+1, ":", value)
110110
}
111111
}
112112
return sb.String()

0 commit comments

Comments
 (0)