diff options
Diffstat (limited to 'src/cmd/fix')
| -rw-r--r-- | src/cmd/fix/netipv6zone.go | 11 | ||||
| -rw-r--r-- | src/cmd/fix/netipv6zone_test.go | 28 |
2 files changed, 12 insertions, 27 deletions
diff --git a/src/cmd/fix/netipv6zone.go b/src/cmd/fix/netipv6zone.go index 587b9ffec..fe973a211 100644 --- a/src/cmd/fix/netipv6zone.go +++ b/src/cmd/fix/netipv6zone.go @@ -14,7 +14,7 @@ var netipv6zoneFix = fix{ "netipv6zone", "2012-11-26", netipv6zone, - `Adapt element key to IPNet, IPAddr, UDPAddr or TCPAddr composite literals. + `Adapt element key to IPAddr, UDPAddr or TCPAddr composite literals. https://codereview.appspot.com/6849045/ `, @@ -39,7 +39,7 @@ func netipv6zone(f *ast.File) bool { return } switch ss := se.Sel.String(); ss { - case "IPNet", "IPAddr", "UDPAddr", "TCPAddr": + case "IPAddr", "UDPAddr", "TCPAddr": for i, e := range cl.Elts { if _, ok := e.(*ast.KeyValueExpr); ok { break @@ -51,11 +51,8 @@ func netipv6zone(f *ast.File) bool { Value: e, } case 1: - if ss == "IPNet" { - cl.Elts[i] = &ast.KeyValueExpr{ - Key: ast.NewIdent("Mask"), - Value: e, - } + if e.(*ast.BasicLit).Value == "0" { + cl.Elts = append(cl.Elts[:i], cl.Elts[i+1:]...) } else { cl.Elts[i] = &ast.KeyValueExpr{ Key: ast.NewIdent("Port"), diff --git a/src/cmd/fix/netipv6zone_test.go b/src/cmd/fix/netipv6zone_test.go index 229daa386..0fab00531 100644 --- a/src/cmd/fix/netipv6zone_test.go +++ b/src/cmd/fix/netipv6zone_test.go @@ -15,36 +15,24 @@ var netipv6zoneTests = []testCase{ import "net" -var a = []struct { - *net.IPNet -}{ - &net.IPNet{net.ParseIP("2001:DB8::"), net.IPMask(net.ParseIP("ffff:ffff:ffff::"))}, -} - func f() net.Addr { - b := net.IPNet{net.IPv4(127, 0, 0, 1), net.IPv4Mask(255, 0, 0, 0)} - c := &net.IPAddr{ip1} + a := &net.IPAddr{ip1} sub(&net.UDPAddr{ip2, 12345}) - d := &net.TCPAddr{IP: ip3, Port: 54321} - return &net.TCPAddr{ip4}, nil + c := &net.TCPAddr{IP: ip3, Port: 54321} + d := &net.TCPAddr{ip4, 0} + return &net.TCPAddr{ip5}, nil } `, Out: `package main import "net" -var a = []struct { - *net.IPNet -}{ - &net.IPNet{IP: net.ParseIP("2001:DB8::"), Mask: net.IPMask(net.ParseIP("ffff:ffff:ffff::"))}, -} - func f() net.Addr { - b := net.IPNet{IP: net.IPv4(127, 0, 0, 1), Mask: net.IPv4Mask(255, 0, 0, 0)} - c := &net.IPAddr{IP: ip1} + a := &net.IPAddr{IP: ip1} sub(&net.UDPAddr{IP: ip2, Port: 12345}) - d := &net.TCPAddr{IP: ip3, Port: 54321} - return &net.TCPAddr{IP: ip4}, nil + c := &net.TCPAddr{IP: ip3, Port: 54321} + d := &net.TCPAddr{IP: ip4} + return &net.TCPAddr{IP: ip5}, nil } `, }, |