Skip to content

Commit 3bb8864

Browse files
tklausergopherbot
authored andcommitted
net/netip: fix type name in TestNoAllocs sub-test names and comments
netaddr.IP became netip.Addr Change-Id: Ifa762d0f804c603e6289d63672e4808e75dc36a8 Reviewed-on: https://go-review.googlesource.com/c/go/+/461748 Reviewed-by: Ian Lance Taylor <[email protected]> TryBot-Result: Gopher Robot <[email protected]> Reviewed-by: Damien Neil <[email protected]> Run-TryBot: Tobias Klauser <[email protected]> Auto-Submit: Tobias Klauser <[email protected]>
1 parent b1a1d7f commit 3bb8864

File tree

1 file changed

+29
-29
lines changed

1 file changed

+29
-29
lines changed

src/net/netip/netip_test.go

+29-29
Original file line numberDiff line numberDiff line change
@@ -1869,7 +1869,7 @@ func TestNoAllocs(t *testing.T) {
18691869
})
18701870
}
18711871

1872-
// IP constructors
1872+
// Addr constructors
18731873
test("IPv4", func() { sinkIP = IPv4(1, 2, 3, 4) })
18741874
test("AddrFrom4", func() { sinkIP = AddrFrom4([4]byte{1, 2, 3, 4}) })
18751875
test("AddrFrom16", func() { sinkIP = AddrFrom16([16]byte{}) })
@@ -1881,41 +1881,41 @@ func TestNoAllocs(t *testing.T) {
18811881
test("IPv6Loopback", func() { sinkIP = IPv6Loopback() })
18821882
test("IPv6Unspecified", func() { sinkIP = IPv6Unspecified() })
18831883

1884-
// IP methods
1885-
test("IP.IsZero", func() { sinkBool = MustParseAddr("1.2.3.4").IsZero() })
1886-
test("IP.BitLen", func() { sinkBool = MustParseAddr("1.2.3.4").BitLen() == 8 })
1887-
test("IP.Zone/4", func() { sinkBool = MustParseAddr("1.2.3.4").Zone() == "" })
1888-
test("IP.Zone/6", func() { sinkBool = MustParseAddr("fe80::1").Zone() == "" })
1889-
test("IP.Zone/6zone", func() { sinkBool = MustParseAddr("fe80::1%zone").Zone() == "" })
1890-
test("IP.Compare", func() {
1884+
// Addr methods
1885+
test("Addr.IsZero", func() { sinkBool = MustParseAddr("1.2.3.4").IsZero() })
1886+
test("Addr.BitLen", func() { sinkBool = MustParseAddr("1.2.3.4").BitLen() == 8 })
1887+
test("Addr.Zone/4", func() { sinkBool = MustParseAddr("1.2.3.4").Zone() == "" })
1888+
test("Addr.Zone/6", func() { sinkBool = MustParseAddr("fe80::1").Zone() == "" })
1889+
test("Addr.Zone/6zone", func() { sinkBool = MustParseAddr("fe80::1%zone").Zone() == "" })
1890+
test("Addr.Compare", func() {
18911891
a := MustParseAddr("1.2.3.4")
18921892
b := MustParseAddr("2.3.4.5")
18931893
sinkBool = a.Compare(b) == 0
18941894
})
1895-
test("IP.Less", func() {
1895+
test("Addr.Less", func() {
18961896
a := MustParseAddr("1.2.3.4")
18971897
b := MustParseAddr("2.3.4.5")
18981898
sinkBool = a.Less(b)
18991899
})
1900-
test("IP.Is4", func() { sinkBool = MustParseAddr("1.2.3.4").Is4() })
1901-
test("IP.Is6", func() { sinkBool = MustParseAddr("fe80::1").Is6() })
1902-
test("IP.Is4In6", func() { sinkBool = MustParseAddr("fe80::1").Is4In6() })
1903-
test("IP.Unmap", func() { sinkIP = MustParseAddr("ffff::2.3.4.5").Unmap() })
1904-
test("IP.WithZone", func() { sinkIP = MustParseAddr("fe80::1").WithZone("") })
1905-
test("IP.IsGlobalUnicast", func() { sinkBool = MustParseAddr("2001:db8::1").IsGlobalUnicast() })
1906-
test("IP.IsInterfaceLocalMulticast", func() { sinkBool = MustParseAddr("fe80::1").IsInterfaceLocalMulticast() })
1907-
test("IP.IsLinkLocalMulticast", func() { sinkBool = MustParseAddr("fe80::1").IsLinkLocalMulticast() })
1908-
test("IP.IsLinkLocalUnicast", func() { sinkBool = MustParseAddr("fe80::1").IsLinkLocalUnicast() })
1909-
test("IP.IsLoopback", func() { sinkBool = MustParseAddr("fe80::1").IsLoopback() })
1910-
test("IP.IsMulticast", func() { sinkBool = MustParseAddr("fe80::1").IsMulticast() })
1911-
test("IP.IsPrivate", func() { sinkBool = MustParseAddr("fd00::1").IsPrivate() })
1912-
test("IP.IsUnspecified", func() { sinkBool = IPv6Unspecified().IsUnspecified() })
1913-
test("IP.Prefix/4", func() { sinkPrefix = panicPfx(MustParseAddr("1.2.3.4").Prefix(20)) })
1914-
test("IP.Prefix/6", func() { sinkPrefix = panicPfx(MustParseAddr("fe80::1").Prefix(64)) })
1915-
test("IP.As16", func() { sinkIP16 = MustParseAddr("1.2.3.4").As16() })
1916-
test("IP.As4", func() { sinkIP4 = MustParseAddr("1.2.3.4").As4() })
1917-
test("IP.Next", func() { sinkIP = MustParseAddr("1.2.3.4").Next() })
1918-
test("IP.Prev", func() { sinkIP = MustParseAddr("1.2.3.4").Prev() })
1900+
test("Addr.Is4", func() { sinkBool = MustParseAddr("1.2.3.4").Is4() })
1901+
test("Addr.Is6", func() { sinkBool = MustParseAddr("fe80::1").Is6() })
1902+
test("Addr.Is4In6", func() { sinkBool = MustParseAddr("fe80::1").Is4In6() })
1903+
test("Addr.Unmap", func() { sinkIP = MustParseAddr("ffff::2.3.4.5").Unmap() })
1904+
test("Addr.WithZone", func() { sinkIP = MustParseAddr("fe80::1").WithZone("") })
1905+
test("Addr.IsGlobalUnicast", func() { sinkBool = MustParseAddr("2001:db8::1").IsGlobalUnicast() })
1906+
test("Addr.IsInterfaceLocalMulticast", func() { sinkBool = MustParseAddr("fe80::1").IsInterfaceLocalMulticast() })
1907+
test("Addr.IsLinkLocalMulticast", func() { sinkBool = MustParseAddr("fe80::1").IsLinkLocalMulticast() })
1908+
test("Addr.IsLinkLocalUnicast", func() { sinkBool = MustParseAddr("fe80::1").IsLinkLocalUnicast() })
1909+
test("Addr.IsLoopback", func() { sinkBool = MustParseAddr("fe80::1").IsLoopback() })
1910+
test("Addr.IsMulticast", func() { sinkBool = MustParseAddr("fe80::1").IsMulticast() })
1911+
test("Addr.IsPrivate", func() { sinkBool = MustParseAddr("fd00::1").IsPrivate() })
1912+
test("Addr.IsUnspecified", func() { sinkBool = IPv6Unspecified().IsUnspecified() })
1913+
test("Addr.Prefix/4", func() { sinkPrefix = panicPfx(MustParseAddr("1.2.3.4").Prefix(20)) })
1914+
test("Addr.Prefix/6", func() { sinkPrefix = panicPfx(MustParseAddr("fe80::1").Prefix(64)) })
1915+
test("Addr.As16", func() { sinkIP16 = MustParseAddr("1.2.3.4").As16() })
1916+
test("Addr.As4", func() { sinkIP4 = MustParseAddr("1.2.3.4").As4() })
1917+
test("Addr.Next", func() { sinkIP = MustParseAddr("1.2.3.4").Next() })
1918+
test("Addr.Prev", func() { sinkIP = MustParseAddr("1.2.3.4").Prev() })
19191919

19201920
// AddrPort constructors
19211921
test("AddrPortFrom", func() { sinkAddrPort = AddrPortFrom(IPv4(1, 2, 3, 4), 22) })
@@ -1936,7 +1936,7 @@ func TestNoAllocs(t *testing.T) {
19361936
})
19371937
test("Prefix.IsZero", func() { sinkBool = MustParsePrefix("1.2.0.0/16").IsZero() })
19381938
test("Prefix.IsSingleIP", func() { sinkBool = MustParsePrefix("1.2.3.4/32").IsSingleIP() })
1939-
test("IPPRefix.Masked", func() { sinkPrefix = MustParsePrefix("1.2.3.4/16").Masked() })
1939+
test("Prefix.Masked", func() { sinkPrefix = MustParsePrefix("1.2.3.4/16").Masked() })
19401940
}
19411941

19421942
func TestAddrStringAllocs(t *testing.T) {

0 commit comments

Comments
 (0)