all: use Go 1.20's errors.Join instead of our multierr package

Updates #7123

Change-Id: Ie9be6814831f661ad5636afcd51d063a0d7a907d
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick
2025-09-30 19:47:50 -07:00
committed by Brad Fitzpatrick
parent 91fa51ca15
commit c2f37c891c
35 changed files with 40 additions and 67 deletions

View File

@@ -10,6 +10,7 @@ package netlog
import (
"context"
"encoding/json"
"errors"
"fmt"
"io"
"log"
@@ -28,7 +29,6 @@ import (
"tailscale.com/tailcfg"
"tailscale.com/types/logid"
"tailscale.com/types/netlogtype"
"tailscale.com/util/multierr"
"tailscale.com/wgengine/router"
)
@@ -272,5 +272,5 @@ func (nl *Logger) Shutdown(ctx context.Context) error {
nl.addrs = nil
nl.prefixes = nil
return multierr.New(err1, err2)
return errors.Join(err1, err2)
}