go.toolchain.branch: switch to Go 1.26

Updates #18682

Change-Id: I1eadfab950e55d004484af880a5d8df6893e85e8
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick
2026-03-04 11:36:08 -08:00
committed by Brad Fitzpatrick
parent 87bf76de89
commit d784dcc61b
25 changed files with 219 additions and 169 deletions
+2 -2
View File
@@ -224,7 +224,7 @@ func runNetworkLockStatus(ctx context.Context, args []string) error {
if nlStatusArgs.json.Value == 1 {
return jsonoutput.PrintNetworkLockStatusJSONV1(os.Stdout, st)
} else {
return fmt.Errorf("unrecognised version: %q", nlStatusArgs.json.Value)
return fmt.Errorf("unrecognised version: %d", nlStatusArgs.json.Value)
}
}
@@ -717,7 +717,7 @@ func printNetworkLockLog(updates []ipnstate.NetworkLockUpdate, out io.Writer, js
if jsonSchema.Value == 1 {
return jsonoutput.PrintNetworkLockLogJSONV1(out, updates)
} else {
return fmt.Errorf("unrecognised version: %q", jsonSchema.Value)
return fmt.Errorf("unrecognised version: %d", jsonSchema.Value)
}
}
+1 -1
View File
@@ -219,7 +219,7 @@ var errHelpFunc = func(m serveMode) error {
// newServeV2Command returns a new "serve" subcommand using e as its environment.
func newServeV2Command(e *serveEnv, subcmd serveMode) *ffcli.Command {
if subcmd != serve && subcmd != funnel {
log.Fatalf("newServeDevCommand called with unknown subcmd %q", subcmd)
log.Fatalf("newServeDevCommand called with unknown subcmd %v", subcmd)
}
info := infoMap[subcmd]
+5 -5
View File
@@ -176,13 +176,13 @@ func runStatus(ctx context.Context, args []string) error {
}
if !ps.Active {
if ps.ExitNode {
f("idle; exit node" + offline)
f("idle; exit node%s", offline)
} else if ps.ExitNodeOption {
f("idle; offers exit node" + offline)
f("idle; offers exit node%s", offline)
} else if anyTraffic {
f("idle" + offline)
f("idle%s", offline)
} else if !ps.Online {
f("offline" + lastSeenFmt(ps.LastSeen))
f("offline%s", lastSeenFmt(ps.LastSeen))
} else {
f("-")
}
@@ -201,7 +201,7 @@ func runStatus(ctx context.Context, args []string) error {
f("peer-relay %s", ps.PeerRelay)
}
if !ps.Online {
f(offline)
f("%s", offline)
}
}
if anyTraffic {