1
0
mirror of https://blitiri.com.ar/repos/chasquid synced 2026-10-28 15:02:28 +00:00

Apply more mechanical simplifications using recent Go features

This is a follow-up on the `go fix` run in commit
0210c5fd92.

That commit recorded the automated updates.

This one applies further simplifications that are mechanical and do not
involve logic changes, but are outside of what `go fix` did.

It also removes some now-obsolete comments and statements.
This commit is contained in:
Alberto Bertogli
2026-10-03 09:08:22 +01:00
parent 0210c5fd92
commit 8d763f450d
33 changed files with 99 additions and 161 deletions
+6 -15
View File
@@ -7,9 +7,10 @@ import (
"errors"
"fmt"
"io/fs"
"maps"
"os"
"path/filepath"
"sort"
"slices"
"strconv"
"strings"
"syscall"
@@ -166,7 +167,7 @@ func checkUserDB() {
path := userDBForDomain("")
// Check if the file exists. This is because userdb.Load does not consider
// it an error.
if _, err := os.Stat(path); os.IsNotExist(err) {
if _, err := os.Stat(path); errors.Is(err, fs.ErrNotExist) {
Fatalf("Error: file %q does not exist", path)
}
@@ -281,13 +282,7 @@ func aliasesResolve() {
// Result is a map of type -> []addresses.
// Sort the types for deterministic output.
ts := []string{}
for t := range vs {
ts = append(ts, t)
}
sort.Strings(ts)
for _, t := range ts {
for _, t := range slices.Sorted(maps.Keys(vs)) {
for _, a := range vs[t] {
fmt.Printf("%v %s\n", t, a)
}
@@ -333,12 +328,8 @@ func parseArgs(usage string) map[string]string {
// Note: Consider handling end of args marker "--" explicitly in
// the future if needed.
if strings.HasPrefix(a, "-") {
sp := strings.SplitN(a, "=", 2)
if len(sp) < 2 {
args[a] = ""
} else {
args[sp[0]] = sp[1]
}
k, v, _ := strings.Cut(a, "=")
args[k] = v
} else {
args["$"+strconv.Itoa(pos)] = a
pos++