build: go fix

Author: howeyc

ledger/cmd/print.go

@@ -208,21 +208,15 @@ func WriteTransaction(w io.StringWriter, trans *ledger.Transaction, columns int)
 	w.WriteString(spaceStr[:1])
 	w.WriteString(trans.Payee)
 	if len(trans.PayeeComment) > 0 {
-		spaceCount := columns - 10 - utf8.RuneCountInString(trans.Payee)
-		if spaceCount < 1 {
-			spaceCount = 1
-		}
+		spaceCount := max(columns-10-utf8.RuneCountInString(trans.Payee), 1)
 		w.WriteString(spaceStr[:spaceCount])
 		w.WriteString(trans.PayeeComment)
 	}
 	w.WriteString(newLine)
 	for _, accChange := range trans.AccountChanges {
 		n := accChange.Balance.FixedBank(amtBuf[:])
 		outBalanceString := unsafe.String(unsafe.SliceData(amtBuf[n:]), 24-n)
-		spaceCount := columns - 4 - utf8.RuneCountInString(accChange.Name) - utf8.RuneCountInString(outBalanceString)
-		if spaceCount < 1 {
-			spaceCount = 1
-		}
+		spaceCount := max(columns-4-utf8.RuneCountInString(accChange.Name)-utf8.RuneCountInString(outBalanceString), 1)
 		w.WriteString(spaceStr[:4])
 		w.WriteString(accChange.Name)
 		w.WriteString(spaceStr[:spaceCount])

ledger/cmd/webHandlerReport.go

@@ -31,9 +31,9 @@ func getRangeAndPeriod(dateRange, dateFreq string) (start, end time.Time, period
 func getAccounts(accountNeedle string, accountsHaystack []*ledger.Account) (results []*ledger.Account) {
 	needleDepth := len(strings.Split(accountNeedle, ":"))
 
-	if dblstarIdx := strings.Index(accountNeedle, "**"); dblstarIdx != -1 {
+	if before, _, ok := strings.Cut(accountNeedle, "**"); ok {
 		foundAccountNames := make(map[string]*ledger.Account)
-		prefixNeedle := accountNeedle[:dblstarIdx]
+		prefixNeedle := before
 		for _, hay := range accountsHaystack {
 			if strings.HasPrefix(hay.Name, prefixNeedle) {
 				foundAccountNames[hay.Name] = hay
@@ -48,8 +48,8 @@ func getAccounts(accountNeedle string, accountsHaystack []*ledger.Account) (resu
 		for _, hay := range foundAccountNames {
 			results = append(results, hay)
 		}
-	} else if starIdx := strings.Index(accountNeedle, "*"); starIdx != -1 {
-		prefixNeedle := accountNeedle[:starIdx]
+	} else if before, _, ok := strings.Cut(accountNeedle, "*"); ok {
+		prefixNeedle := before
 		for _, hay := range accountsHaystack {
 			hayDepth := len(strings.Split(hay.Name, ":"))
 			if strings.HasPrefix(hay.Name, prefixNeedle) && hayDepth == needleDepth {