mirror of
https://github.com/tailscale/tailscale.git
synced 2025-08-11 13:18:53 +00:00
util/cmpx: delete now that we're using Go 1.22
Updates #11058 Change-Id: I09dea8e86f03ec148b715efca339eab8b1f0f644 Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:

committed by
Brad Fitzpatrick

parent
5ea071186e
commit
2bd3c1474b
@@ -7,6 +7,7 @@ package tailcfg
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"cmp"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
@@ -22,7 +23,6 @@ import (
|
||||
"tailscale.com/types/opt"
|
||||
"tailscale.com/types/structs"
|
||||
"tailscale.com/types/tkatype"
|
||||
"tailscale.com/util/cmpx"
|
||||
"tailscale.com/util/dnsname"
|
||||
"tailscale.com/util/slicesx"
|
||||
)
|
||||
@@ -475,7 +475,7 @@ func (n *Node) IsTagged() bool {
|
||||
|
||||
// SharerOrUser Sharer if set, else User.
|
||||
func (n *Node) SharerOrUser() UserID {
|
||||
return cmpx.Or(n.Sharer, n.User)
|
||||
return cmp.Or(n.Sharer, n.User)
|
||||
}
|
||||
|
||||
// IsTagged reports whether the node has any tags.
|
||||
|
Reference in New Issue
Block a user