TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-12-24 17:47:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

3
wgengine/router/osrouter/ifconfig_windows.go
View File

@@ -18,7 +18,6 @@ import (
"tailscale.com/net/netmon"
"tailscale.com/net/tsaddr"
"tailscale.com/net/tstun"
"tailscale.com/util/multierr"
"tailscale.com/wgengine/router"
"tailscale.com/wgengine/winnet"
@@ -831,5 +830,5 @@ func syncRoutes(ifc *winipcfg.IPAdapterAddresses, want []*routeData, dontDelete
}
}
return multierr.New(errs...)
return errors.Join(errs...)
}

3
wgengine/router/osrouter/router_linux.go
View File

@@ -32,7 +32,6 @@ import (
"tailscale.com/types/preftype"
"tailscale.com/util/eventbus"
"tailscale.com/util/linuxfw"
"tailscale.com/util/multierr"
"tailscale.com/version/distro"
"tailscale.com/wgengine/router"
)
@@ -488,7 +487,7 @@ func (r *linuxRouter) Set(cfg *router.Config) error {
r.enableIPForwarding()
}
return multierr.New(errs...)
return errors.Join(errs...)
}
var dockerStatefulFilteringWarnable = health.Register(&health.Warnable{