From 3e653d4e53ac1b460307d58632e12d2ce08dd233 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Sat, 11 Jan 2025 11:21:55 -0800 Subject: [PATCH] lanscaping: remove sole golang.org/x/exp/maps use (unused) -rwxr-xr-x@ 1 bradfitz staff 10159042 Jan 11 11:22 /Users/bradfitz/bin/tailscaled.min -rwxr-xr-x@ 1 bradfitz staff 10158232 Jan 11 11:22 /Users/bradfitz/bin/tailscaled.minlinux Change-Id: I24eb4f772bd0f319f88cdd22b88313d6cc3b676c Signed-off-by: Brad Fitzpatrick --- cmd/tailscaled/depaware-minlinux.txt | 3 +-- ipn/store/mem/store_mem.go | 15 --------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/cmd/tailscaled/depaware-minlinux.txt b/cmd/tailscaled/depaware-minlinux.txt index d9665a9e0..ecbfa7a70 100644 --- a/cmd/tailscaled/depaware-minlinux.txt +++ b/cmd/tailscaled/depaware-minlinux.txt @@ -146,7 +146,6 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de golang.org/x/crypto/poly1305 from github.com/tailscale/wireguard-go/device golang.org/x/crypto/salsa20/salsa from golang.org/x/crypto/nacl/box+ golang.org/x/crypto/sha3 from crypto/internal/mlkem768+ - golang.org/x/exp/maps from tailscale.com/ipn/store/mem golang.org/x/net/bpf from github.com/mdlayher/socket+ golang.org/x/net/dns/dnsmessage from net golang.org/x/net/http/httpguts from golang.org/x/net/http2+ @@ -215,7 +214,7 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de iter from maps+ log from expvar+ log/internal from log - maps from golang.org/x/exp/maps+ + maps from net/http+ math from compress/flate+ math/big from crypto/dsa+ math/bits from compress/flate+ diff --git a/ipn/store/mem/store_mem.go b/ipn/store/mem/store_mem.go index 6f474ce99..a1044d903 100644 --- a/ipn/store/mem/store_mem.go +++ b/ipn/store/mem/store_mem.go @@ -9,10 +9,8 @@ import ( "encoding/json" "sync" - xmaps "golang.org/x/exp/maps" "tailscale.com/ipn" "tailscale.com/types/logger" - "tailscale.com/util/mak" ) // New returns a new Store. @@ -53,19 +51,6 @@ func (s *Store) WriteState(id ipn.StateKey, bs []byte) error { return nil } -// LoadFromMap loads the in-memory cache from the provided map. -// Any existing content is cleared, and the provided map is -// copied into the cache. -func (s *Store) LoadFromMap(m map[string][]byte) { - s.mu.Lock() - defer s.mu.Unlock() - xmaps.Clear(s.cache) - for k, v := range m { - mak.Set(&s.cache, ipn.StateKey(k), v) - } - return -} - // LoadFromJSON attempts to unmarshal json content into the // in-memory cache. func (s *Store) LoadFromJSON(data []byte) error {