code review 7554051: cmd/fix: revert IPv6 scoped address zone support of IPNet

cmd/fix: revert IPv6 scoped address zone support of IPNet

[mikio, 2013-03-19 14:16:35]

Hello golang-dev@googlegroups.com (cc: golang-dev@googlegroups.com),

I'd like you to review this change to
https://code.google.com/p/go

[bradfitz, 2013-03-19 15:15:43]

LGTM
 On Mar 19, 2013 7:16 AM, <mikioh.mikioh@gmail.com> wrote:

> Reviewers: golang-dev1,
>
> Message:
> Hello golang-dev@googlegroups.com (cc: golang-dev@googlegroups.com),
>
> I'd like you to review this change to
> https://code.google.com/p/go
>
>
> Description:
> cmd/fix: revert IPv6 scoped address zone support of IPNet
>
> Please review this at
https://codereview.appspot.**com/7554051/<https://codereview.appspot.com/7554...
>
> Affected files:
>   M src/cmd/fix/netipv6zone.go
>   M src/cmd/fix/netipv6zone_test.**go
>
>
> Index: src/cmd/fix/netipv6zone.go
> ==============================**==============================**=======
> --- a/src/cmd/fix/netipv6zone.go
> +++ b/src/cmd/fix/netipv6zone.go
> @@ -14,7 +14,7 @@
>         "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/<https://codereview.appspot.com/6849...
>  `,
> @@ -39,7 +39,7 @@
>                         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,21 +51,13 @@
>                                                 Value: e,
>                                         }
>                                 case 1:
> -                                       if ss == "IPNet" {
> +                                       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("Mask"),
> +                                                       Key:
> ast.NewIdent("Port"),
>                                                         Value: e,
>                                                 }
> -                                       } else {
> -                                               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"),
> -                                                               Value: e,
> -                                                       }
> -                                               }
> -
>                                         }
>                                 }
>                                 fixed = true
> Index: src/cmd/fix/netipv6zone_test.**go
> ==============================**==============================**=======
> --- a/src/cmd/fix/netipv6zone_**test.go
> +++ b/src/cmd/fix/netipv6zone_**test.go
> @@ -15,18 +15,11 @@
>
>  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}
> -       e := &net.TCPAddr{ip4, 0}
> +       c := &net.TCPAddr{IP: ip3, Port: 54321}
> +       d := &net.TCPAddr{ip4, 0}
>         return &net.TCPAddr{ip5}, nil
>  }
>  `,
> @@ -34,18 +27,11 @@
>
>  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}
> -       e := &net.TCPAddr{IP: ip4}
> +       c := &net.TCPAddr{IP: ip3, Port: 54321}
> +       d := &net.TCPAddr{IP: ip4}
>         return &net.TCPAddr{IP: ip5}, nil
>  }
>  `,
>
>
> --
>
> ---You received this message because you are subscribed to the Google
> Groups "golang-dev" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to
golang-dev+unsubscribe@**googlegroups.com<golang-dev%2Bunsubscribe@googlegrou...
> .
> For more options, visit
https://groups.google.com/**groups/opt_out<https://groups.google.com/groups/o...
> .
>
>
>

[mikio, 2013-03-19 16:05:25]

*** Submitted as https://code.google.com/p/go/source/detail?r=b4128b295144 ***

cmd/fix: revert IPv6 scoped address zone support of IPNet

R=golang-dev, bradfitz
CC=golang-dev
https://codereview.appspot.com/7554051