net/netip: use Addr.appendTo4In6 in Addr.AppendTo

Change-Id: Ieb1931c40b37b87fc7d0011461d9f583e73aaff9
Reviewed-on: https://go-review.googlesource.com/c/go/+/557778
Auto-Submit: Tobias Klauser <tobias.klauser@gmail.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Cherry Mui <cherryyz@google.com>
Reviewed-by: Damien Neil <dneil@google.com>

diff --git a/src/net/netip/netip.go b/src/net/netip/netip.go
index 5c0c7afd97faec5345ce2c544a7c52a4a65c0ed1..1494fb2413f0b4268b35222c2ebd5cdc8eb6f3b9 100644 (file)
--- a/src/net/netip/netip.go
+++ b/src/net/netip/netip.go
@@ -773,13 +773,7 @@ func (ip Addr) AppendTo(b []byte) []byte {
                return ip.appendTo4(b)
        default:
                if ip.Is4In6() {
-                       b = append(b, "::ffff:"...)
-                       b = ip.Unmap().appendTo4(b)
-                       if z := ip.Zone(); z != "" {
-                               b = append(b, '%')
-                               b = append(b, z...)
-                       }
-                       return b
+                       return ip.appendTo4In6(b)
                }
                return ip.appendTo6(b)
        }