diff options
| author | Bryan C. Mills <bcmills@google.com> | 2018-11-05 15:01:53 -0500 |
|---|---|---|
| committer | Bryan C. Mills <bcmills@google.com> | 2018-11-29 15:42:16 +0000 |
| commit | 2012227b01020eb505cf1dbe719b1fa74ed8c5f4 (patch) | |
| tree | ed0efe504a2f7e1c716803440572be8452fe329b /src/net | |
| parent | 70a684cf44cc3398c44afcd69387d7938d90f063 (diff) | |
| download | go-2012227b01020eb505cf1dbe719b1fa74ed8c5f4.tar.xz | |
vendor/golang_org/x: move to internal/x
Packages in vendor/ directories have a "vendor/" path prefix in GOPATH
mode, but intentionally do not in module mode. Since the import path
is embedded in the compiled output, changing that path invalidates
cache entries and causes cmd/go to try to rebuild (and reinstall) the
vendored libraries, which will fail if the directory containing those
libraries is read-only.
If I understood correctly, this is the approach Russ suggested as an
alternative to https://golang.org/cl/136138.
Fixes #27285
Fixes #26988
Change-Id: I8a2507fa892b84cde0a803aaa79e460723da572b
Reviewed-on: https://go-review.googlesource.com/c/147443
Run-TryBot: Bryan C. Mills <bcmills@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Russ Cox <rsc@golang.org>
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/dnsclient.go | 2 | ||||
| -rw-r--r-- | src/net/dnsclient_unix.go | 2 | ||||
| -rw-r--r-- | src/net/dnsclient_unix_test.go | 2 | ||||
| -rw-r--r-- | src/net/http/h2_bundle.go | 6 | ||||
| -rw-r--r-- | src/net/http/http.go | 2 | ||||
| -rw-r--r-- | src/net/http/httptest/recorder.go | 2 | ||||
| -rw-r--r-- | src/net/http/httputil/reverseproxy.go | 2 | ||||
| -rw-r--r-- | src/net/http/request.go | 2 | ||||
| -rw-r--r-- | src/net/http/response.go | 2 | ||||
| -rw-r--r-- | src/net/http/server.go | 2 | ||||
| -rw-r--r-- | src/net/http/transfer.go | 2 | ||||
| -rw-r--r-- | src/net/http/transport.go | 4 | ||||
| -rw-r--r-- | src/net/http/transport_test.go | 2 | ||||
| -rw-r--r-- | src/net/interface_bsd.go | 2 | ||||
| -rw-r--r-- | src/net/interface_bsdvar.go | 2 | ||||
| -rw-r--r-- | src/net/interface_darwin.go | 2 | ||||
| -rw-r--r-- | src/net/interface_freebsd.go | 2 | ||||
| -rw-r--r-- | src/net/interface_solaris.go | 2 | ||||
| -rw-r--r-- | src/net/lookup_unix.go | 2 | ||||
| -rw-r--r-- | src/net/pipe_test.go | 2 |
20 files changed, 23 insertions, 23 deletions
diff --git a/src/net/dnsclient.go b/src/net/dnsclient.go index 2c47bc4130..4fdf60ff4e 100644 --- a/src/net/dnsclient.go +++ b/src/net/dnsclient.go @@ -8,7 +8,7 @@ import ( "math/rand" "sort" - "golang_org/x/net/dns/dnsmessage" + "internal/x/net/dns/dnsmessage" ) // reverseaddr returns the in-addr.arpa. or ip6.arpa. hostname of the IP diff --git a/src/net/dnsclient_unix.go b/src/net/dnsclient_unix.go index 73630faa49..86ce92dc43 100644 --- a/src/net/dnsclient_unix.go +++ b/src/net/dnsclient_unix.go @@ -23,7 +23,7 @@ import ( "sync" "time" - "golang_org/x/net/dns/dnsmessage" + "internal/x/net/dns/dnsmessage" ) var ( diff --git a/src/net/dnsclient_unix_test.go b/src/net/dnsclient_unix_test.go index 7dccb6b8ec..be04a44c14 100644 --- a/src/net/dnsclient_unix_test.go +++ b/src/net/dnsclient_unix_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "golang_org/x/net/dns/dnsmessage" + "internal/x/net/dns/dnsmessage" ) var goResolver = Resolver{PreferGo: true} diff --git a/src/net/http/h2_bundle.go b/src/net/http/h2_bundle.go index 12cf65f109..1a97b01db8 100644 --- a/src/net/http/h2_bundle.go +++ b/src/net/http/h2_bundle.go @@ -44,9 +44,9 @@ import ( "sync" "time" - "golang_org/x/net/http/httpguts" - "golang_org/x/net/http2/hpack" - "golang_org/x/net/idna" + "internal/x/net/http/httpguts" + "internal/x/net/http2/hpack" + "internal/x/net/idna" ) // A list of the possible cipher suite ids. Taken from diff --git a/src/net/http/http.go b/src/net/http/http.go index 30d1a52b63..624b2cfe69 100644 --- a/src/net/http/http.go +++ b/src/net/http/http.go @@ -11,7 +11,7 @@ import ( "time" "unicode/utf8" - "golang_org/x/net/http/httpguts" + "internal/x/net/http/httpguts" ) // maxInt64 is the effective "infinite" value for the Server and diff --git a/src/net/http/httptest/recorder.go b/src/net/http/httptest/recorder.go index 67f90b8376..f2c3c0757b 100644 --- a/src/net/http/httptest/recorder.go +++ b/src/net/http/httptest/recorder.go @@ -12,7 +12,7 @@ import ( "strconv" "strings" - "golang_org/x/net/http/httpguts" + "internal/x/net/http/httpguts" ) // ResponseRecorder is an implementation of http.ResponseWriter that diff --git a/src/net/http/httputil/reverseproxy.go b/src/net/http/httputil/reverseproxy.go index e9552a2256..f0607a68ea 100644 --- a/src/net/http/httputil/reverseproxy.go +++ b/src/net/http/httputil/reverseproxy.go @@ -18,7 +18,7 @@ import ( "sync" "time" - "golang_org/x/net/http/httpguts" + "internal/x/net/http/httpguts" ) // ReverseProxy is an HTTP Handler that takes an incoming request and diff --git a/src/net/http/request.go b/src/net/http/request.go index d994e81d23..fb058f9fbf 100644 --- a/src/net/http/request.go +++ b/src/net/http/request.go @@ -26,7 +26,7 @@ import ( "strings" "sync" - "golang_org/x/net/idna" + "internal/x/net/idna" ) const ( diff --git a/src/net/http/response.go b/src/net/http/response.go index b3ca56c419..f906ce829b 100644 --- a/src/net/http/response.go +++ b/src/net/http/response.go @@ -12,7 +12,7 @@ import ( "crypto/tls" "errors" "fmt" - "golang_org/x/net/http/httpguts" + "internal/x/net/http/httpguts" "io" "net/textproto" "net/url" diff --git a/src/net/http/server.go b/src/net/http/server.go index cf03b09f84..97ed59e9fd 100644 --- a/src/net/http/server.go +++ b/src/net/http/server.go @@ -29,7 +29,7 @@ import ( "sync/atomic" "time" - "golang_org/x/net/http/httpguts" + "internal/x/net/http/httpguts" ) // Errors used by the HTTP server. diff --git a/src/net/http/transfer.go b/src/net/http/transfer.go index 3eb9f0da91..e8a93e9137 100644 --- a/src/net/http/transfer.go +++ b/src/net/http/transfer.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "golang_org/x/net/http/httpguts" + "internal/x/net/http/httpguts" ) // ErrLineTooLong is returned when reading request or response bodies diff --git a/src/net/http/transport.go b/src/net/http/transport.go index ad0201d554..f30ad2151c 100644 --- a/src/net/http/transport.go +++ b/src/net/http/transport.go @@ -30,8 +30,8 @@ import ( "sync/atomic" "time" - "golang_org/x/net/http/httpguts" - "golang_org/x/net/http/httpproxy" + "internal/x/net/http/httpguts" + "internal/x/net/http/httpproxy" ) // DefaultTransport is the default implementation of Transport and is diff --git a/src/net/http/transport_test.go b/src/net/http/transport_test.go index 1021ce5aa2..6e075847dd 100644 --- a/src/net/http/transport_test.go +++ b/src/net/http/transport_test.go @@ -42,7 +42,7 @@ import ( "testing" "time" - "golang_org/x/net/http/httpguts" + "internal/x/net/http/httpguts" ) // TODO: test 5 pipelined requests with responses: 1) OK, 2) OK, Connection: Close diff --git a/src/net/interface_bsd.go b/src/net/interface_bsd.go index 35b1c26815..77372964b1 100644 --- a/src/net/interface_bsd.go +++ b/src/net/interface_bsd.go @@ -9,7 +9,7 @@ package net import ( "syscall" - "golang_org/x/net/route" + "internal/x/net/route" ) // If the ifindex is zero, interfaceTable returns mappings of all diff --git a/src/net/interface_bsdvar.go b/src/net/interface_bsdvar.go index 0b84ca37d4..818fafe970 100644 --- a/src/net/interface_bsdvar.go +++ b/src/net/interface_bsdvar.go @@ -9,7 +9,7 @@ package net import ( "syscall" - "golang_org/x/net/route" + "internal/x/net/route" ) func interfaceMessages(ifindex int) ([]route.Message, error) { diff --git a/src/net/interface_darwin.go b/src/net/interface_darwin.go index 2ec8e1cc6e..6a6b3a5818 100644 --- a/src/net/interface_darwin.go +++ b/src/net/interface_darwin.go @@ -7,7 +7,7 @@ package net import ( "syscall" - "golang_org/x/net/route" + "internal/x/net/route" ) func interfaceMessages(ifindex int) ([]route.Message, error) { diff --git a/src/net/interface_freebsd.go b/src/net/interface_freebsd.go index 8a7d6f67c0..8eee2aa031 100644 --- a/src/net/interface_freebsd.go +++ b/src/net/interface_freebsd.go @@ -7,7 +7,7 @@ package net import ( "syscall" - "golang_org/x/net/route" + "internal/x/net/route" ) func interfaceMessages(ifindex int) ([]route.Message, error) { diff --git a/src/net/interface_solaris.go b/src/net/interface_solaris.go index dc8ffbfcb8..868d4174ed 100644 --- a/src/net/interface_solaris.go +++ b/src/net/interface_solaris.go @@ -7,7 +7,7 @@ package net import ( "syscall" - "golang_org/x/net/lif" + "internal/x/net/lif" ) // If the ifindex is zero, interfaceTable returns mappings of all diff --git a/src/net/lookup_unix.go b/src/net/lookup_unix.go index bef9dcfe14..6543f121a7 100644 --- a/src/net/lookup_unix.go +++ b/src/net/lookup_unix.go @@ -12,7 +12,7 @@ import ( "sync" "syscall" - "golang_org/x/net/dns/dnsmessage" + "internal/x/net/dns/dnsmessage" ) var onceReadProtocols sync.Once diff --git a/src/net/pipe_test.go b/src/net/pipe_test.go index 84a71b756b..53ddc16313 100644 --- a/src/net/pipe_test.go +++ b/src/net/pipe_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "golang_org/x/net/nettest" + "internal/x/net/nettest" ) func TestPipe(t *testing.T) { |
