mirrors/tailscale
1
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

types/ptr: move all the ptrTo funcs to one new package's ptr.To

Browse Source 
Change-Id: Ia0b820ffe7aa72897515f19bd415204b6fe743c7
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick
2022-11-30 17:33:29 -08:00
committed by Brad Fitzpatrick
parent a277eb4dcf
commit 197a4f1ae8
11 changed files with 56 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
util/deephash/deephash_test.go
View File

@ -27,6 +27,7 @@ import (
"tailscale.com/types/dnstype"
"tailscale.com/types/ipproto"
"tailscale.com/types/key"
"tailscale.com/types/ptr"
"tailscale.com/util/deephash/testtype"
"tailscale.com/util/dnsname"
"tailscale.com/version"
@ -485,7 +486,7 @@ func TestGetTypeHasher(t *testing.T) {
},
{
name: "time_ptr", // addressable, as opposed to "time" test above
val: ptrTo(time.Unix(1234, 5678).In(time.UTC)),
val: ptr.To(time.Unix(1234, 5678).In(time.UTC)),
out: u8(1) + u64(1234) + u32(5678) + u32(0),
},
{
@ -515,7 +516,7 @@ func TestGetTypeHasher(t *testing.T) {
},
{
name: "array_ptr_memhash",
val: ptrTo([4]byte{1, 2, 3, 4}),
val: ptr.To([4]byte{1, 2, 3, 4}),
out: "\x01\x01\x02\x03\x04",
},
{
@ -742,8 +743,6 @@ func BenchmarkHash(b *testing.B) {
}
}
func ptrTo[T any](v T) *T { return &v }
// filterRules is a packet filter that has both everything populated (in its
// first element) and also a few entries that are the typical shape for regular
// packet filters as sent to clients.
@ -753,7 +752,7 @@ var filterRules = []tailcfg.FilterRule{
SrcBits: []int{1, 2, 3},
DstPorts: []tailcfg.NetPortRange{{
IP: "1.2.3.4/32",
Bits: ptrTo(32),
Bits: ptr.To(32),
Ports: tailcfg.PortRange{First: 1, Last: 2},
}},
IPProto: []int{1, 2, 3, 4},
@ -936,7 +935,7 @@ func TestHashThroughView(t *testing.T) {
SSHPolicy: &sshPolicyOut{
Rules: []tailcfg.SSHRuleView{
(&tailcfg.SSHRule{
RuleExpires: ptrTo(time.Unix(123, 0)),
RuleExpires: ptr.To(time.Unix(123, 0)),
}).View(),
},
},