TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-08-12 05:37:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

all: import x/exp/maps as xmaps to distinguish from Go 1.21 "maps"

Browse Source 
Updates #8419

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick
2023-08-17 09:40:19 -07:00
committed by Brad Fitzpatrick
parent e8551d6b40
commit bc0eb6b914
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wgengine/magicsock/endpoint.go
View File

@@ -20,7 +20,7 @@ import (
"time"
"golang.org/x/crypto/poly1305"
"golang.org/x/exp/maps"
xmaps "golang.org/x/exp/maps"
"tailscale.com/disco"
"tailscale.com/ipn/ipnstate"
"tailscale.com/net/stun"
@@ -313,7 +313,7 @@ func (de *endpoint) addrForWireGuardSendLocked(now mono.Time) (udpAddr netip.Add
return udpAddr, false
}
candidates := maps.Keys(de.endpointState)
candidates := xmaps.Keys(de.endpointState)
if len(candidates) == 0 {
de.c.logf("magicsock: addrForSendWireguardLocked: [unexpected] no candidates available for endpoint")
return udpAddr, false

4
wgengine/magicsock/magicsock_test.go
View File

@@ -31,7 +31,7 @@ import (
"github.com/tailscale/wireguard-go/device"
"github.com/tailscale/wireguard-go/tun/tuntest"
"go4.org/mem"
"golang.org/x/exp/maps"
xmaps "golang.org/x/exp/maps"
"golang.org/x/net/icmp"
"golang.org/x/net/ipv4"
"golang.org/x/net/ipv6"
@@ -1081,7 +1081,7 @@ func testTwoDevicePing(t *testing.T, d *devices) {
}
}
t.Helper()
t.Errorf("missing any connection to %s from %s", wantConns, maps.Keys(stats))
t.Errorf("missing any connection to %s from %s", wantConns, xmaps.Keys(stats))
}
addrPort := netip.MustParseAddrPort