code review 5335048: net: renamings

net: renamings
This is Go 1 package renaming CL #3.
This one merely moves the source; the import strings will be
changed after the next weekly release.
This one moves pieces into net.

http -> net/http
http/cgi -> net/http/cgi
http/fcgi -> net/http/fcgi
http/pprof -> net/http/pprof
http/httptest -> net/http/httptest
mail -> net/mail
rpc -> net/rpc
rpc/jsonrpc -> net/rpc/jsonrpc
smtp -> net/smtp
url -> net/url

Also remove rand (now math/rand) from NOTEST - it has a test.

The only edits are in Makefiles and deps.bash.

[r, 2011-11-03 20:04:58]

Hello golang-dev@googlegroups.com,

I'd like you to review this change to
https://go.googlecode.com/hg/

[bradfitz, 2011-11-03 20:23:20]

LGTM

On Thu, Nov 3, 2011 at 1:04 PM, <r@golang.org> wrote:

> Reviewers: golang-dev_googlegroups.com,
>
> Message:
> Hello golang-dev@googlegroups.com,
>
> I'd like you to review this change to
> https://go.googlecode.com/hg/
>
>
> Description:
> net: renamings
> This is Go 1 package renaming CL #3.
> This one merely moves the source; the import strings will be
> changed after the next weekly release.
> This one moves pieces into net.
>
> http -> net/http
> http/cgi -> net/http/cgi
> http/fcgi -> net/http/fcgi
> http/pprof -> net/http/pprof
> http/httptest -> net/http/httptest
> mail -> net/mail
> rpc -> net/rpc
> rpc/jsonrpc -> net/rpc/jsonrpc
> smtp -> net/smtp
> url -> net/rpc
>
> Also remove rand (now math/rand) from NOTEST - it has a test.
>
> The only edits are in Makefiles and deps.bash.
>
> Please review this at
http://codereview.appspot.com/**5335048/<http://codereview.appspot.com/5335048/>
>
> Affected files:
>  M src/pkg/Makefile
>  M src/pkg/deps.bash
>  M src/pkg/net/http/Makefile
>  M src/pkg/net/http/cgi/Makefile
>  M src/pkg/net/http/cgi/child.go
>  M src/pkg/net/http/cgi/child_**test.go
>  M src/pkg/net/http/cgi/host.go
>  M src/pkg/net/http/cgi/host_**test.go
>  M src/pkg/net/http/cgi/**matryoshka_test.go
>  M src/pkg/net/http/cgi/testdata/**test.cgi
>  M src/pkg/net/http/chunked.go
>  M src/pkg/net/http/client.go
>  M src/pkg/net/http/client_test.**go
>  M src/pkg/net/http/cookie.go
>  M src/pkg/net/http/cookie_test.**go
>  M src/pkg/net/http/doc.go
>  M src/pkg/net/http/dump.go
>  M src/pkg/net/http/export_test.**go
>  M src/pkg/net/http/fcgi/Makefile
>  M src/pkg/net/http/fcgi/child.go
>  M src/pkg/net/http/fcgi/fcgi.go
>  M src/pkg/net/http/fcgi/fcgi_**test.go
>  M src/pkg/net/http/**filetransport.go
>  M src/pkg/net/http/**filetransport_test.go
>  M src/pkg/net/http/fs.go
>  M src/pkg/net/http/fs_test.go
>  M src/pkg/net/http/header.go
>  M src/pkg/net/http/header_test.**go
>  M src/pkg/net/http/httptest/**Makefile
>  M src/pkg/net/http/httptest/**recorder.go
>  M src/pkg/net/http/httptest/**server.go
>  M src/pkg/net/http/lex.go
>  M src/pkg/net/http/lex_test.go
>  M src/pkg/net/http/persist.go
>  M src/pkg/net/http/pprof/**Makefile
>  M src/pkg/net/http/pprof/pprof.**go
>  M src/pkg/net/http/proxy_test.go
>  M src/pkg/net/http/range_test.go
>  M src/pkg/net/http/readrequest_**test.go
>  M src/pkg/net/http/request.go
>  M src/pkg/net/http/request_test.**go
>  M src/pkg/net/http/requestwrite_**test.go
>  M src/pkg/net/http/response.go
>  M src/pkg/net/http/response_**test.go
>  M src/pkg/net/http/**responsewrite_test.go
>  M src/pkg/net/http/reverseproxy.**go
>  M src/pkg/net/http/reverseproxy_**test.go
>  M src/pkg/net/http/serve_test.go
>  M src/pkg/net/http/server.go
>  M src/pkg/net/http/sniff.go
>  M src/pkg/net/http/sniff_test.go
>  M src/pkg/net/http/status.go
>  M src/pkg/net/http/testdata/file
>  M src/pkg/net/http/testdata/**index.html
>  M src/pkg/net/http/testdata/**style.css
>  M src/pkg/net/http/transfer.go
>  M src/pkg/net/http/transport.go
>  M src/pkg/net/http/transport_**test.go
>  M src/pkg/net/http/transport_**windows.go
>  M src/pkg/net/http/triv.go
>  M src/pkg/net/mail/Makefile
>  M src/pkg/net/mail/message.go
>  M src/pkg/net/mail/message_test.**go
>  M src/pkg/net/rpc/Makefile
>  M src/pkg/net/rpc/client.go
>  M src/pkg/net/rpc/debug.go
>  M src/pkg/net/rpc/jsonrpc/**Makefile
>  M src/pkg/net/rpc/jsonrpc/all_**test.go
>  M src/pkg/net/rpc/jsonrpc/**client.go
>  M src/pkg/net/rpc/jsonrpc/**server.go
>  M src/pkg/net/rpc/server.go
>  M src/pkg/net/rpc/server_test.go
>  M src/pkg/net/smtp/Makefile
>  M src/pkg/net/smtp/auth.go
>  M src/pkg/net/smtp/smtp.go
>  M src/pkg/net/smtp/smtp_test.go
>  M src/pkg/net/url/Makefile
>  M src/pkg/net/url/url.go
>  M src/pkg/net/url/url_test.go
>
>
> Index: src/pkg/Makefile
> ==============================**==============================**=======
> --- a/src/pkg/Makefile
> +++ b/src/pkg/Makefile
> @@ -105,11 +105,6 @@
>        hash/fnv\
>        html\
>        html/template\
> -       http\
> -       http/cgi\
> -       http/fcgi\
> -       http/pprof\
> -       http/httptest\
>        image\
>        image/bmp\
>        image/color\
> @@ -124,7 +119,6 @@
>        io/ioutil\
>        log\
>        log/syslog\
> -       mail\
>        math\
>        math/big\
>        math/cmplx\
> @@ -133,7 +127,17 @@
>        mime/multipart\
>        net\
>        net/dict\
> +       net/http\
> +       net/http/cgi\
> +       net/http/fcgi\
> +       net/mail\
> +       net/http/pprof\
> +       net/http/httptest\
> +       net/rpc\
> +       net/rpc/jsonrpc\
> +       net/smtp\
>        net/textproto\
> +       net/url\
>        old/netchan\
>        old/regexp\
>        old/template\
> @@ -146,14 +150,11 @@
>        reflect\
>        regexp\
>        regexp/syntax\
> -       rpc\
> -       rpc/jsonrpc\
>        runtime\
>        runtime/cgo\
>        runtime/debug\
>        runtime/pprof\
>        scanner\
> -       smtp\
>        sort\
>        strconv\
>        strings\
> @@ -169,7 +170,6 @@
>        testing/script\
>        time\
>        unicode\
> -       url\
>        utf16\
>        utf8\
>        websocket\
> @@ -205,13 +205,12 @@
>        exp/gui/x11\
>        go/doc\
>        hash\
> -       http/pprof\
> -       http/httptest\
>        image/bmp\
>        image/color\
>        image/gif\
>        net/dict\
> -       rand\
> +       net/http/pprof\
> +       net/http/httptest\
>        runtime/cgo\
>        syscall\
>        testing\
> Index: src/pkg/deps.bash
> ==============================**==============================**=======
> --- a/src/pkg/deps.bash
> +++ b/src/pkg/deps.bash
> @@ -31,9 +31,18 @@
>  /^(csv)$/
>  /^(exp\/template\/html)$/
>  /^(gob)$/
> +/^(http)/
> +/^(http\/cgi)$/
> +/^(http\/fcgi)$/
> +/^(http\/httptest)$/
> +/^(http\/pprof)$/
>  /^(json)$/
> +/^(mail)$/
>  /^(rand)$/
> +/^(rpc)$/
> +/^(smtp)$/
>  /^(syslog)$/
> +/^(url)$/
>  /^(xml)$/
>  "
>
> @@ -60,9 +69,19 @@
>                s;^csv.install$;encoding/csv.**install;
>                s;^exp/template/html.install$;**html/template.install;
>                s;^gob.install$;encoding/gob.**install;
> +               s;^http.install$;net/http.**install;
> +               s;^http/cgi.install$;net/http/**cgi.install;
> +               s;^http/fcgi.install$;net/**http/fcgi.install;
> +               s;^http/httptest.install$;net/**http/httptest.install;
> +               s;^http/pprof.install$;net/**http/pprof.install;
>                s;^json.install$;encoding/**json.install;
> +               s;^mail.install$;net/mail.**install;
> +               s;^rpc.install$;net/rpc.**install;
> +               s;^rpc/jsonrpc.install$;net/**rpc/jsonrpc.install;
> +               s;^smtp.install$;net/smtp.**install;
>                s;^syslog.install$;log/syslog.**install;
>                s;^rand.install$;math/rand.**install;
> +               s;^url.install$;net/url.**install;
>                s;^xml.install$;encoding/xml.**install;' |
>                # TODO: end of renamings.
>                sed 's;^C\.install;runtime/cgo.**install;' |
> Index: src/pkg/net/http/Makefile
> ==============================**==============================**=======
> rename from src/pkg/http/Makefile
> rename to src/pkg/net/http/Makefile
> --- a/src/pkg/http/Makefile
> +++ b/src/pkg/net/http/Makefile
> @@ -2,7 +2,7 @@
>  # Use of this source code is governed by a BSD-style
>  # license that can be found in the LICENSE file.
>
> -include ../../Make.inc
> +include ../../../Make.inc
>
>  TARG=http
>  GOFILES=\
> @@ -29,4 +29,4 @@
>
>  GOFILES+=$(GOFILES_$(GOOS))
>
> -include ../../Make.pkg
> +include ../../../Make.pkg
> Index: src/pkg/net/http/cgi/Makefile
> ==============================**==============================**=======
> rename from src/pkg/http/cgi/Makefile
> rename to src/pkg/net/http/cgi/Makefile
> --- a/src/pkg/http/cgi/Makefile
> +++ b/src/pkg/net/http/cgi/**Makefile
> @@ -2,11 +2,11 @@
>  # Use of this source code is governed by a BSD-style
>  # license that can be found in the LICENSE file.
>
> -include ../../../Make.inc
> +include ../../../../Make.inc
>
>  TARG=http/cgi
>  GOFILES=\
>        child.go\
>        host.go\
>
> -include ../../../Make.pkg
> +include ../../../../Make.pkg
> Index: src/pkg/net/http/cgi/child.go
> ==============================**==============================**=======
> rename from src/pkg/http/cgi/child.go
> rename to src/pkg/net/http/cgi/child.go
> Index: src/pkg/net/http/cgi/child_**test.go
> ==============================**==============================**=======
> rename from src/pkg/http/cgi/child_test.go
> rename to src/pkg/net/http/cgi/child_**test.go
> Index: src/pkg/net/http/cgi/host.go
> ==============================**==============================**=======
> rename from src/pkg/http/cgi/host.go
> rename to src/pkg/net/http/cgi/host.go
> Index: src/pkg/net/http/cgi/host_**test.go
> ==============================**==============================**=======
> rename from src/pkg/http/cgi/host_test.go
> rename to src/pkg/net/http/cgi/host_**test.go
> Index: src/pkg/net/http/cgi/**matryoshka_test.go
> ==============================**==============================**=======
> rename from src/pkg/http/cgi/matryoshka_**test.go
> rename to src/pkg/net/http/cgi/**matryoshka_test.go
> Index: src/pkg/net/http/cgi/testdata/**test.cgi
> ==============================**==============================**=======
> rename from src/pkg/http/cgi/testdata/**test.cgi
> rename to src/pkg/net/http/cgi/testdata/**test.cgi
> Index: src/pkg/net/http/chunked.go
> ==============================**==============================**=======
> rename from src/pkg/http/chunked.go
> rename to src/pkg/net/http/chunked.go
> Index: src/pkg/net/http/client.go
> ==============================**==============================**=======
> rename from src/pkg/http/client.go
> rename to src/pkg/net/http/client.go
> Index: src/pkg/net/http/client_test.**go
> ==============================**==============================**=======
> rename from src/pkg/http/client_test.go
> rename to src/pkg/net/http/client_test.**go
> Index: src/pkg/net/http/cookie.go
> ==============================**==============================**=======
> rename from src/pkg/http/cookie.go
> rename to src/pkg/net/http/cookie.go
> Index: src/pkg/net/http/cookie_test.**go
> ==============================**==============================**=======
> rename from src/pkg/http/cookie_test.go
> rename to src/pkg/net/http/cookie_test.**go
> Index: src/pkg/net/http/doc.go
> ==============================**==============================**=======
> rename from src/pkg/http/doc.go
> rename to src/pkg/net/http/doc.go
> Index: src/pkg/net/http/dump.go
> ==============================**==============================**=======
> rename from src/pkg/http/dump.go
> rename to src/pkg/net/http/dump.go
> Index: src/pkg/net/http/export_test.**go
> ==============================**==============================**=======
> rename from src/pkg/http/export_test.go
> rename to src/pkg/net/http/export_test.**go
> Index: src/pkg/net/http/fcgi/Makefile
> ==============================**==============================**=======
> rename from src/pkg/http/fcgi/Makefile
> rename to src/pkg/net/http/fcgi/Makefile
> --- a/src/pkg/http/fcgi/Makefile
> +++ b/src/pkg/net/http/fcgi/**Makefile
> @@ -2,11 +2,11 @@
>  # Use of this source code is governed by a BSD-style
>  # license that can be found in the LICENSE file.
>
> -include ../../../Make.inc
> +include ../../../../Make.inc
>
>  TARG=http/fcgi
>  GOFILES=\
>        child.go\
>        fcgi.go\
>
> -include ../../../Make.pkg
> +include ../../../../Make.pkg
> Index: src/pkg/net/http/fcgi/child.go
> ==============================**==============================**=======
> rename from src/pkg/http/fcgi/child.go
> rename to src/pkg/net/http/fcgi/child.go
> Index: src/pkg/net/http/fcgi/fcgi.go
> ==============================**==============================**=======
> rename from src/pkg/http/fcgi/fcgi.go
> rename to src/pkg/net/http/fcgi/fcgi.go
> Index: src/pkg/net/http/fcgi/fcgi_**test.go
> ==============================**==============================**=======
> rename from src/pkg/http/fcgi/fcgi_test.go
> rename to src/pkg/net/http/fcgi/fcgi_**test.go
> Index: src/pkg/net/http/**filetransport.go
> ==============================**==============================**=======
> rename from src/pkg/http/filetransport.go
> rename to src/pkg/net/http/**filetransport.go
> Index: src/pkg/net/http/**filetransport_test.go
> ==============================**==============================**=======
> rename from src/pkg/http/filetransport_**test.go
> rename to src/pkg/net/http/**filetransport_test.go
> Index: src/pkg/net/http/fs.go
> ==============================**==============================**=======
> rename from src/pkg/http/fs.go
> rename to src/pkg/net/http/fs.go
> Index: src/pkg/net/http/fs_test.go
> ==============================**==============================**=======
> rename from src/pkg/http/fs_test.go
> rename to src/pkg/net/http/fs_test.go
> Index: src/pkg/net/http/header.go
> ==============================**==============================**=======
> rename from src/pkg/http/header.go
> rename to src/pkg/net/http/header.go
> Index: src/pkg/net/http/header_test.**go
> ==============================**==============================**=======
> rename from src/pkg/http/header_test.go
> rename to src/pkg/net/http/header_test.**go
> Index: src/pkg/net/http/httptest/**Makefile
> ==============================**==============================**=======
> rename from src/pkg/http/httptest/Makefile
> rename to src/pkg/net/http/httptest/**Makefile
> --- a/src/pkg/http/httptest/**Makefile
> +++ b/src/pkg/net/http/httptest/**Makefile
> @@ -2,11 +2,11 @@
>  # Use of this source code is governed by a BSD-style
>  # license that can be found in the LICENSE file.
>
> -include ../../../Make.inc
> +include ../../../../Make.inc
>
>  TARG=http/httptest
>  GOFILES=\
>        recorder.go\
>        server.go\
>
> -include ../../../Make.pkg
> +include ../../../../Make.pkg
> Index: src/pkg/net/http/httptest/**recorder.go
> ==============================**==============================**=======
> rename from src/pkg/http/httptest/**recorder.go
> rename to src/pkg/net/http/httptest/**recorder.go
> Index: src/pkg/net/http/httptest/**server.go
> ==============================**==============================**=======
> rename from src/pkg/http/httptest/server.**go
> rename to src/pkg/net/http/httptest/**server.go
> Index: src/pkg/net/http/lex.go
> ==============================**==============================**=======
> rename from src/pkg/http/lex.go
> rename to src/pkg/net/http/lex.go
> Index: src/pkg/net/http/lex_test.go
> ==============================**==============================**=======
> rename from src/pkg/http/lex_test.go
> rename to src/pkg/net/http/lex_test.go
> Index: src/pkg/net/http/persist.go
> ==============================**==============================**=======
> rename from src/pkg/http/persist.go
> rename to src/pkg/net/http/persist.go
> Index: src/pkg/net/http/pprof/**Makefile
> ==============================**==============================**=======
> rename from src/pkg/http/pprof/Makefile
> rename to src/pkg/net/http/pprof/**Makefile
> --- a/src/pkg/http/pprof/Makefile
> +++ b/src/pkg/net/http/pprof/**Makefile
> @@ -2,10 +2,10 @@
>  # Use of this source code is governed by a BSD-style
>  # license that can be found in the LICENSE file.
>
> -include ../../../Make.inc
> +include ../../../../Make.inc
>
>  TARG=http/pprof
>  GOFILES=\
>        pprof.go\
>
> -include ../../../Make.pkg
> +include ../../../../Make.pkg
> Index: src/pkg/net/http/pprof/pprof.**go
> ==============================**==============================**=======
> rename from src/pkg/http/pprof/pprof.go
> rename to src/pkg/net/http/pprof/pprof.**go
> Index: src/pkg/net/http/proxy_test.go
> ==============================**==============================**=======
> rename from src/pkg/http/proxy_test.go
> rename to src/pkg/net/http/proxy_test.go
> Index: src/pkg/net/http/range_test.go
> ==============================**==============================**=======
> rename from src/pkg/http/range_test.go
> rename to src/pkg/net/http/range_test.go
> Index: src/pkg/net/http/readrequest_**test.go
> ==============================**==============================**=======
> rename from src/pkg/http/readrequest_test.**go
> rename to src/pkg/net/http/readrequest_**test.go
> Index: src/pkg/net/http/request.go
> ==============================**==============================**=======
> rename from src/pkg/http/request.go
> rename to src/pkg/net/http/request.go
> Index: src/pkg/net/http/request_test.**go
> ==============================**==============================**=======
> rename from src/pkg/http/request_test.go
> rename to src/pkg/net/http/request_test.**go
> Index: src/pkg/net/http/requestwrite_**test.go
> ==============================**==============================**=======
> rename from src/pkg/http/requestwrite_**test.go
> rename to src/pkg/net/http/requestwrite_**test.go
> Index: src/pkg/net/http/response.go
> ==============================**==============================**=======
> rename from src/pkg/http/response.go
> rename to src/pkg/net/http/response.go
> Index: src/pkg/net/http/response_**test.go
> ==============================**==============================**=======
> rename from src/pkg/http/response_test.go
> rename to src/pkg/net/http/response_**test.go
> Index: src/pkg/net/http/**responsewrite_test.go
> ==============================**==============================**=======
> rename from src/pkg/http/responsewrite_**test.go
> rename to src/pkg/net/http/**responsewrite_test.go
> Index: src/pkg/net/http/reverseproxy.**go
> ==============================**==============================**=======
> rename from src/pkg/http/reverseproxy.go
> rename to src/pkg/net/http/reverseproxy.**go
> Index: src/pkg/net/http/reverseproxy_**test.go
> ==============================**==============================**=======
> rename from src/pkg/http/reverseproxy_**test.go
> rename to src/pkg/net/http/reverseproxy_**test.go
> Index: src/pkg/net/http/serve_test.go
> ==============================**==============================**=======
> rename from src/pkg/http/serve_test.go
> rename to src/pkg/net/http/serve_test.go
> Index: src/pkg/net/http/server.go
> ==============================**==============================**=======
> rename from src/pkg/http/server.go
> rename to src/pkg/net/http/server.go
> Index: src/pkg/net/http/sniff.go
> ==============================**==============================**=======
> rename from src/pkg/http/sniff.go
> rename to src/pkg/net/http/sniff.go
> Index: src/pkg/net/http/sniff_test.go
> ==============================**==============================**=======
> rename from src/pkg/http/sniff_test.go
> rename to src/pkg/net/http/sniff_test.go
> Index: src/pkg/net/http/status.go
> ==============================**==============================**=======
> rename from src/pkg/http/status.go
> rename to src/pkg/net/http/status.go
> Index: src/pkg/net/http/testdata/file
> ==============================**==============================**=======
> rename from src/pkg/http/testdata/file
> rename to src/pkg/net/http/testdata/file
> Index: src/pkg/net/http/testdata/**index.html
> ==============================**==============================**=======
> rename from src/pkg/http/testdata/index.**html
> rename to src/pkg/net/http/testdata/**index.html
> Index: src/pkg/net/http/testdata/**style.css
> ==============================**==============================**=======
> rename from src/pkg/http/testdata/style.**css
> rename to src/pkg/net/http/testdata/**style.css
> Index: src/pkg/net/http/transfer.go
> ==============================**==============================**=======
> rename from src/pkg/http/transfer.go
> rename to src/pkg/net/http/transfer.go
> Index: src/pkg/net/http/transport.go
> ==============================**==============================**=======
> rename from src/pkg/http/transport.go
> rename to src/pkg/net/http/transport.go
> Index: src/pkg/net/http/transport_**test.go
> ==============================**==============================**=======
> rename from src/pkg/http/transport_test.go
> rename to src/pkg/net/http/transport_**test.go
> Index: src/pkg/net/http/transport_**windows.go
> ==============================**==============================**=======
> rename from src/pkg/http/transport_**windows.go
> rename to src/pkg/net/http/transport_**windows.go
> Index: src/pkg/net/http/triv.go
> ==============================**==============================**=======
> rename from src/pkg/http/triv.go
> rename to src/pkg/net/http/triv.go
> Index: src/pkg/net/mail/Makefile
> ==============================**==============================**=======
> rename from src/pkg/mail/Makefile
> rename to src/pkg/net/mail/Makefile
> --- a/src/pkg/mail/Makefile
> +++ b/src/pkg/net/mail/Makefile
> @@ -2,10 +2,10 @@
>  # Use of this source code is governed by a BSD-style
>  # license that can be found in the LICENSE file.
>
> -include ../../Make.inc
> +include ../../../Make.inc
>
>  TARG=mail
>  GOFILES=\
>        message.go\
>
> -include ../../Make.pkg
> +include ../../../Make.pkg
> Index: src/pkg/net/mail/message.go
> ==============================**==============================**=======
> rename from src/pkg/mail/message.go
> rename to src/pkg/net/mail/message.go
> Index: src/pkg/net/mail/message_test.**go
> ==============================**==============================**=======
> rename from src/pkg/mail/message_test.go
> rename to src/pkg/net/mail/message_test.**go
> Index: src/pkg/net/rpc/Makefile
> ==============================**==============================**=======
> rename from src/pkg/rpc/Makefile
> rename to src/pkg/net/rpc/Makefile
> --- a/src/pkg/rpc/Makefile
> +++ b/src/pkg/net/rpc/Makefile
> @@ -2,7 +2,7 @@
>  # Use of this source code is governed by a BSD-style
>  # license that can be found in the LICENSE file.
>
> -include ../../Make.inc
> +include ../../../Make.inc
>
>  TARG=rpc
>  GOFILES=\
> @@ -10,4 +10,4 @@
>        debug.go\
>        server.go\
>
> -include ../../Make.pkg
> +include ../../../Make.pkg
> Index: src/pkg/net/rpc/client.go
> ==============================**==============================**=======
> rename from src/pkg/rpc/client.go
> rename to src/pkg/net/rpc/client.go
> Index: src/pkg/net/rpc/debug.go
> ==============================**==============================**=======
> rename from src/pkg/rpc/debug.go
> rename to src/pkg/net/rpc/debug.go
> Index: src/pkg/net/rpc/jsonrpc/**Makefile
> ==============================**==============================**=======
> rename from src/pkg/rpc/jsonrpc/Makefile
> rename to src/pkg/net/rpc/jsonrpc/**Makefile
> --- a/src/pkg/rpc/jsonrpc/Makefile
> +++ b/src/pkg/net/rpc/jsonrpc/**Makefile
> @@ -2,11 +2,11 @@
>  # Use of this source code is governed by a BSD-style
>  # license that can be found in the LICENSE file.
>
> -include ../../../Make.inc
> +include ../../../../Make.inc
>
>  TARG=rpc/jsonrpc
>  GOFILES=\
>        client.go\
>        server.go\
>
> -include ../../../Make.pkg
> +include ../../../../Make.pkg
> Index: src/pkg/net/rpc/jsonrpc/all_**test.go
> ==============================**==============================**=======
> rename from src/pkg/rpc/jsonrpc/all_test.**go
> rename to src/pkg/net/rpc/jsonrpc/all_**test.go
> Index: src/pkg/net/rpc/jsonrpc/**client.go
> ==============================**==============================**=======
> rename from src/pkg/rpc/jsonrpc/client.go
> rename to src/pkg/net/rpc/jsonrpc/**client.go
> Index: src/pkg/net/rpc/jsonrpc/**server.go
> ==============================**==============================**=======
> rename from src/pkg/rpc/jsonrpc/server.go
> rename to src/pkg/net/rpc/jsonrpc/**server.go
> Index: src/pkg/net/rpc/server.go
> ==============================**==============================**=======
> rename from src/pkg/rpc/server.go
> rename to src/pkg/net/rpc/server.go
> Index: src/pkg/net/rpc/server_test.go
> ==============================**==============================**=======
> rename from src/pkg/rpc/server_test.go
> rename to src/pkg/net/rpc/server_test.go
> Index: src/pkg/net/smtp/Makefile
> ==============================**==============================**=======
> rename from src/pkg/smtp/Makefile
> rename to src/pkg/net/smtp/Makefile
> --- a/src/pkg/smtp/Makefile
> +++ b/src/pkg/net/smtp/Makefile
> @@ -2,11 +2,11 @@
>  # Use of this source code is governed by a BSD-style
>  # license that can be found in the LICENSE file.
>
> -include ../../Make.inc
> +include ../../../Make.inc
>
>  TARG=smtp
>  GOFILES=\
>        auth.go\
>        smtp.go\
>
> -include ../../Make.pkg
> +include ../../../Make.pkg
> Index: src/pkg/net/smtp/auth.go
> ==============================**==============================**=======
> rename from src/pkg/smtp/auth.go
> rename to src/pkg/net/smtp/auth.go
> Index: src/pkg/net/smtp/smtp.go
> ==============================**==============================**=======
> rename from src/pkg/smtp/smtp.go
> rename to src/pkg/net/smtp/smtp.go
> Index: src/pkg/net/smtp/smtp_test.go
> ==============================**==============================**=======
> rename from src/pkg/smtp/smtp_test.go
> rename to src/pkg/net/smtp/smtp_test.go
> Index: src/pkg/net/url/Makefile
> ==============================**==============================**=======
> rename from src/pkg/url/Makefile
> rename to src/pkg/net/url/Makefile
> --- a/src/pkg/url/Makefile
> +++ b/src/pkg/net/url/Makefile
> @@ -2,10 +2,10 @@
>  # Use of this source code is governed by a BSD-style
>  # license that can be found in the LICENSE file.
>
> -include ../../Make.inc
> +include ../../../Make.inc
>
>  TARG=url
>  GOFILES=\
>        url.go\
>
> -include ../../Make.pkg
> +include ../../../Make.pkg
> Index: src/pkg/net/url/url.go
> ==============================**==============================**=======
> rename from src/pkg/url/url.go
> rename to src/pkg/net/url/url.go
> Index: src/pkg/net/url/url_test.go
> ==============================**==============================**=======
> rename from src/pkg/url/url_test.go
> rename to src/pkg/net/url/url_test.go
>
>
>

[r, 2011-11-03 20:26:51]

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

net: renamings
This is Go 1 package renaming CL #3.
This one merely moves the source; the import strings will be
changed after the next weekly release.
This one moves pieces into net.

http -> net/http
http/cgi -> net/http/cgi
http/fcgi -> net/http/fcgi
http/pprof -> net/http/pprof
http/httptest -> net/http/httptest
mail -> net/mail
rpc -> net/rpc
rpc/jsonrpc -> net/rpc/jsonrpc
smtp -> net/smtp
url -> net/url

Also remove rand (now math/rand) from NOTEST - it has a test.

The only edits are in Makefiles and deps.bash.

R=golang-dev, bradfitz
CC=golang-dev
http://codereview.appspot.com/5335048