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:
committed by
Brad Fitzpatrick
parent
91fa51ca15
commit
c2f37c891c
@@ -13,7 +13,6 @@ import (
|
||||
"tailscale.com/net/stun"
|
||||
"tailscale.com/types/logger"
|
||||
"tailscale.com/types/nettype"
|
||||
"tailscale.com/util/multierr"
|
||||
)
|
||||
|
||||
// Standalone creates the necessary UDP sockets on the given bindAddr and starts
|
||||
@@ -62,7 +61,7 @@ func (c *Client) Standalone(ctx context.Context, bindAddr string) error {
|
||||
|
||||
// If both v4 and v6 failed, report an error, otherwise let one succeed.
|
||||
if len(errs) == 2 {
|
||||
return multierr.New(errs...)
|
||||
return errors.Join(errs...)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user