diff options
author | Brad Fitzpatrick <bradfitz@golang.org> | 2016-07-13 10:49:48 -0600 |
---|---|---|
committer | Brad Fitzpatrick <bradfitz@golang.org> | 2016-07-13 18:35:40 +0000 |
commit | 4d00937cecdea85b6f1eb894a6d28a53f5f2ff8a (patch) | |
tree | e394c817134f527ac6b33d619464166ac3a218af | |
parent | 1cb3f7169ccff3ae2197784676404e8d0d3f5e32 (diff) | |
download | go-4d00937cecdea85b6f1eb894a6d28a53f5f2ff8a.tar.gz go-4d00937cecdea85b6f1eb894a6d28a53f5f2ff8a.zip |
all: rename vendored golang.org/x/net packages to golang_org
Regression from Go 1.6 to Go 1.7rc1: we had broken the ability for
users to vendor "golang.org/x/net/http2" or "golang.org/x/net/route"
because we were vendoring them ourselves and cmd/go and cmd/compile do
not understand multiple vendor directories across multiple GOPATH
workspaces (e.g. user's $GOPATH and default $GOROOT).
As a short-term fix, since fixing cmd/go and cmd/compile is too
invasive at this point in the cycle, just rename "golang.org" to
"golang_org" for the standard library's vendored copy.
Fixes #16333
Change-Id: I9bfaed91e9f7d4ca6bab07befe80d71d437a21af
Reviewed-on: https://go-review.googlesource.com/24902
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
-rw-r--r-- | src/cmd/api/goapi.go | 2 | ||||
-rw-r--r-- | src/go/build/build_test.go | 8 | ||||
-rw-r--r-- | src/go/build/deps_test.go | 8 | ||||
-rw-r--r-- | src/net/http/h2_bundle.go | 4 | ||||
-rw-r--r-- | src/net/http/http.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 | 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/vendor/golang_org/x/net/http2/hpack/encode.go (renamed from src/vendor/golang.org/x/net/http2/hpack/encode.go) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/http2/hpack/encode_test.go (renamed from src/vendor/golang.org/x/net/http2/hpack/encode_test.go) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/http2/hpack/hpack.go (renamed from src/vendor/golang.org/x/net/http2/hpack/hpack.go) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/http2/hpack/hpack_test.go (renamed from src/vendor/golang.org/x/net/http2/hpack/hpack_test.go) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/http2/hpack/huffman.go (renamed from src/vendor/golang.org/x/net/http2/hpack/huffman.go) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/http2/hpack/tables.go (renamed from src/vendor/golang.org/x/net/http2/hpack/tables.go) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/lex/httplex/httplex.go (renamed from src/vendor/golang.org/x/net/lex/httplex/httplex.go) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/lex/httplex/httplex_test.go (renamed from src/vendor/golang.org/x/net/lex/httplex/httplex_test.go) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/route/address.go (renamed from src/vendor/golang.org/x/net/route/address.go) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/route/address_darwin_test.go (renamed from src/vendor/golang.org/x/net/route/address_darwin_test.go) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/route/address_test.go (renamed from src/vendor/golang.org/x/net/route/address_test.go) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/route/binary.go (renamed from src/vendor/golang.org/x/net/route/binary.go) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/route/defs_darwin.go (renamed from src/vendor/golang.org/x/net/route/defs_darwin.go) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/route/defs_dragonfly.go (renamed from src/vendor/golang.org/x/net/route/defs_dragonfly.go) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/route/defs_freebsd.go (renamed from src/vendor/golang.org/x/net/route/defs_freebsd.go) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/route/defs_netbsd.go (renamed from src/vendor/golang.org/x/net/route/defs_netbsd.go) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/route/defs_openbsd.go (renamed from src/vendor/golang.org/x/net/route/defs_openbsd.go) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/route/interface.go (renamed from src/vendor/golang.org/x/net/route/interface.go) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/route/interface_announce.go (renamed from src/vendor/golang.org/x/net/route/interface_announce.go) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/route/interface_classic.go (renamed from src/vendor/golang.org/x/net/route/interface_classic.go) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/route/interface_freebsd.go (renamed from src/vendor/golang.org/x/net/route/interface_freebsd.go) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/route/interface_multicast.go (renamed from src/vendor/golang.org/x/net/route/interface_multicast.go) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/route/interface_openbsd.go (renamed from src/vendor/golang.org/x/net/route/interface_openbsd.go) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/route/message.go (renamed from src/vendor/golang.org/x/net/route/message.go) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/route/message_darwin_test.go (renamed from src/vendor/golang.org/x/net/route/message_darwin_test.go) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/route/message_freebsd_test.go (renamed from src/vendor/golang.org/x/net/route/message_freebsd_test.go) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/route/message_test.go (renamed from src/vendor/golang.org/x/net/route/message_test.go) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/route/route.go (renamed from src/vendor/golang.org/x/net/route/route.go) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/route/route_classic.go (renamed from src/vendor/golang.org/x/net/route/route_classic.go) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/route/route_openbsd.go (renamed from src/vendor/golang.org/x/net/route/route_openbsd.go) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/route/route_test.go (renamed from src/vendor/golang.org/x/net/route/route_test.go) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/route/sys.go (renamed from src/vendor/golang.org/x/net/route/sys.go) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/route/sys_darwin.go (renamed from src/vendor/golang.org/x/net/route/sys_darwin.go) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/route/sys_dragonfly.go (renamed from src/vendor/golang.org/x/net/route/sys_dragonfly.go) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/route/sys_freebsd.go (renamed from src/vendor/golang.org/x/net/route/sys_freebsd.go) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/route/sys_netbsd.go (renamed from src/vendor/golang.org/x/net/route/sys_netbsd.go) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/route/sys_openbsd.go (renamed from src/vendor/golang.org/x/net/route/sys_openbsd.go) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/route/syscall.go (renamed from src/vendor/golang.org/x/net/route/syscall.go) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/route/syscall.s (renamed from src/vendor/golang.org/x/net/route/syscall.s) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/route/zsys_darwin.go (renamed from src/vendor/golang.org/x/net/route/zsys_darwin.go) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/route/zsys_dragonfly.go (renamed from src/vendor/golang.org/x/net/route/zsys_dragonfly.go) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/route/zsys_freebsd_386.go (renamed from src/vendor/golang.org/x/net/route/zsys_freebsd_386.go) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/route/zsys_freebsd_amd64.go (renamed from src/vendor/golang.org/x/net/route/zsys_freebsd_amd64.go) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/route/zsys_freebsd_arm.go (renamed from src/vendor/golang.org/x/net/route/zsys_freebsd_arm.go) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/route/zsys_netbsd.go (renamed from src/vendor/golang.org/x/net/route/zsys_netbsd.go) | 0 | ||||
-rw-r--r-- | src/vendor/golang_org/x/net/route/zsys_openbsd.go (renamed from src/vendor/golang.org/x/net/route/zsys_openbsd.go) | 0 |
58 files changed, 19 insertions, 19 deletions
diff --git a/src/cmd/api/goapi.go b/src/cmd/api/goapi.go index e9c91477c6..936f9e5511 100644 --- a/src/cmd/api/goapi.go +++ b/src/cmd/api/goapi.go @@ -425,7 +425,7 @@ func (w *Walker) Import(name string) (*types.Package, error) { w.imported[name] = &importing root := w.root - if strings.HasPrefix(name, "golang.org/x/") { + if strings.HasPrefix(name, "golang_org/x/") { root = filepath.Join(root, "vendor") } diff --git a/src/go/build/build_test.go b/src/go/build/build_test.go index c9f906a7da..198a649b15 100644 --- a/src/go/build/build_test.go +++ b/src/go/build/build_test.go @@ -303,11 +303,11 @@ func TestImportVendor(t *testing.T) { testenv.MustHaveGoBuild(t) // really must just have source ctxt := Default ctxt.GOPATH = "" - p, err := ctxt.Import("golang.org/x/net/http2/hpack", filepath.Join(ctxt.GOROOT, "src/net/http"), 0) + p, err := ctxt.Import("golang_org/x/net/http2/hpack", filepath.Join(ctxt.GOROOT, "src/net/http"), 0) if err != nil { - t.Fatalf("cannot find vendored golang.org/x/net/http2/hpack from net/http directory: %v", err) + t.Fatalf("cannot find vendored golang_org/x/net/http2/hpack from net/http directory: %v", err) } - want := "vendor/golang.org/x/net/http2/hpack" + want := "vendor/golang_org/x/net/http2/hpack" if p.ImportPath != want { t.Fatalf("Import succeeded but found %q, want %q", p.ImportPath, want) } @@ -333,7 +333,7 @@ func TestImportVendorParentFailure(t *testing.T) { ctxt := Default ctxt.GOPATH = "" // This import should fail because the vendor/golang.org/x/net/http2 directory has no source code. - p, err := ctxt.Import("golang.org/x/net/http2", filepath.Join(ctxt.GOROOT, "src/net/http"), 0) + p, err := ctxt.Import("golang_org/x/net/http2", filepath.Join(ctxt.GOROOT, "src/net/http"), 0) if err == nil { t.Fatalf("found empty parent in %s", p.Dir) } diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go index 335e774a7c..5b2529129c 100644 --- a/src/go/build/deps_test.go +++ b/src/go/build/deps_test.go @@ -297,7 +297,7 @@ var pkgDeps = map[string][]string{ "context", "math/rand", "os", "sort", "syscall", "time", "internal/nettrace", "internal/syscall/windows", "internal/singleflight", "internal/race", - "golang.org/x/net/route", + "golang_org/x/net/route", }, // NET enables use of basic network-related packages. @@ -378,8 +378,8 @@ var pkgDeps = map[string][]string{ "context", "compress/gzip", "container/list", "crypto/tls", "mime/multipart", "runtime/debug", "net/http/internal", - "golang.org/x/net/http2/hpack", - "golang.org/x/net/lex/httplex", + "golang_org/x/net/http2/hpack", + "golang_org/x/net/lex/httplex", "internal/nettrace", "net/http/httptrace", }, @@ -443,7 +443,7 @@ func listStdPkgs(goroot string) ([]string, error) { } name := filepath.ToSlash(path[len(src):]) - if name == "builtin" || name == "cmd" || strings.Contains(name, ".") { + if name == "builtin" || name == "cmd" || strings.Contains(name, "golang_org") { return filepath.SkipDir } diff --git a/src/net/http/h2_bundle.go b/src/net/http/h2_bundle.go index 352a41d414..47e5f577e6 100644 --- a/src/net/http/h2_bundle.go +++ b/src/net/http/h2_bundle.go @@ -41,8 +41,8 @@ import ( "sync" "time" - "golang.org/x/net/http2/hpack" - "golang.org/x/net/lex/httplex" + "golang_org/x/net/http2/hpack" + "golang_org/x/net/lex/httplex" ) // ClientConnPool manages a pool of HTTP/2 client connections. diff --git a/src/net/http/http.go b/src/net/http/http.go index 4d088a5bb1..b34ae41ec5 100644 --- a/src/net/http/http.go +++ b/src/net/http/http.go @@ -7,7 +7,7 @@ package http import ( "strings" - "golang.org/x/net/lex/httplex" + "golang_org/x/net/lex/httplex" ) // maxInt64 is the effective "infinite" value for the Server and diff --git a/src/net/http/server.go b/src/net/http/server.go index 9bf4d667e2..7b2b4b2f42 100644 --- a/src/net/http/server.go +++ b/src/net/http/server.go @@ -28,7 +28,7 @@ import ( "sync/atomic" "time" - "golang.org/x/net/lex/httplex" + "golang_org/x/net/lex/httplex" ) // Errors used by the HTTP server. diff --git a/src/net/http/transfer.go b/src/net/http/transfer.go index b27ace638a..c653467098 100644 --- a/src/net/http/transfer.go +++ b/src/net/http/transfer.go @@ -18,7 +18,7 @@ import ( "strings" "sync" - "golang.org/x/net/lex/httplex" + "golang_org/x/net/lex/httplex" ) // ErrLineTooLong is returned when reading request or response bodies diff --git a/src/net/http/transport.go b/src/net/http/transport.go index f7904b4a89..0c81b55e12 100644 --- a/src/net/http/transport.go +++ b/src/net/http/transport.go @@ -27,7 +27,7 @@ import ( "sync" "time" - "golang.org/x/net/lex/httplex" + "golang_org/x/net/lex/httplex" ) // DefaultTransport is the default implementation of Transport and is diff --git a/src/net/interface_bsd.go b/src/net/interface_bsd.go index d791cb3016..35b1c26815 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" + "golang_org/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 a809b5f5ce..0b84ca37d4 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" + "golang_org/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 bb4fd73a98..2ec8e1cc6e 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" + "golang_org/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 45badd6495..8a7d6f67c0 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" + "golang_org/x/net/route" ) func interfaceMessages(ifindex int) ([]route.Message, error) { diff --git a/src/vendor/golang.org/x/net/http2/hpack/encode.go b/src/vendor/golang_org/x/net/http2/hpack/encode.go index f9bb033984..f9bb033984 100644 --- a/src/vendor/golang.org/x/net/http2/hpack/encode.go +++ b/src/vendor/golang_org/x/net/http2/hpack/encode.go diff --git a/src/vendor/golang.org/x/net/http2/hpack/encode_test.go b/src/vendor/golang_org/x/net/http2/hpack/encode_test.go index 92286f3bad..92286f3bad 100644 --- a/src/vendor/golang.org/x/net/http2/hpack/encode_test.go +++ b/src/vendor/golang_org/x/net/http2/hpack/encode_test.go diff --git a/src/vendor/golang.org/x/net/http2/hpack/hpack.go b/src/vendor/golang_org/x/net/http2/hpack/hpack.go index 8aa197ad67..8aa197ad67 100644 --- a/src/vendor/golang.org/x/net/http2/hpack/hpack.go +++ b/src/vendor/golang_org/x/net/http2/hpack/hpack.go diff --git a/src/vendor/golang.org/x/net/http2/hpack/hpack_test.go b/src/vendor/golang_org/x/net/http2/hpack/hpack_test.go index 4c7b17bfb1..4c7b17bfb1 100644 --- a/src/vendor/golang.org/x/net/http2/hpack/hpack_test.go +++ b/src/vendor/golang_org/x/net/http2/hpack/hpack_test.go diff --git a/src/vendor/golang.org/x/net/http2/hpack/huffman.go b/src/vendor/golang_org/x/net/http2/hpack/huffman.go index 8850e39467..8850e39467 100644 --- a/src/vendor/golang.org/x/net/http2/hpack/huffman.go +++ b/src/vendor/golang_org/x/net/http2/hpack/huffman.go diff --git a/src/vendor/golang.org/x/net/http2/hpack/tables.go b/src/vendor/golang_org/x/net/http2/hpack/tables.go index b9283a0233..b9283a0233 100644 --- a/src/vendor/golang.org/x/net/http2/hpack/tables.go +++ b/src/vendor/golang_org/x/net/http2/hpack/tables.go diff --git a/src/vendor/golang.org/x/net/lex/httplex/httplex.go b/src/vendor/golang_org/x/net/lex/httplex/httplex.go index bd0ec24f44..bd0ec24f44 100644 --- a/src/vendor/golang.org/x/net/lex/httplex/httplex.go +++ b/src/vendor/golang_org/x/net/lex/httplex/httplex.go diff --git a/src/vendor/golang.org/x/net/lex/httplex/httplex_test.go b/src/vendor/golang_org/x/net/lex/httplex/httplex_test.go index c4ace1991b..c4ace1991b 100644 --- a/src/vendor/golang.org/x/net/lex/httplex/httplex_test.go +++ b/src/vendor/golang_org/x/net/lex/httplex/httplex_test.go diff --git a/src/vendor/golang.org/x/net/route/address.go b/src/vendor/golang_org/x/net/route/address.go index 206a8371d4..206a8371d4 100644 --- a/src/vendor/golang.org/x/net/route/address.go +++ b/src/vendor/golang_org/x/net/route/address.go diff --git a/src/vendor/golang.org/x/net/route/address_darwin_test.go b/src/vendor/golang_org/x/net/route/address_darwin_test.go index b86bd3df1f..b86bd3df1f 100644 --- a/src/vendor/golang.org/x/net/route/address_darwin_test.go +++ b/src/vendor/golang_org/x/net/route/address_darwin_test.go diff --git a/src/vendor/golang.org/x/net/route/address_test.go b/src/vendor/golang_org/x/net/route/address_test.go index 2005ef7c20..2005ef7c20 100644 --- a/src/vendor/golang.org/x/net/route/address_test.go +++ b/src/vendor/golang_org/x/net/route/address_test.go diff --git a/src/vendor/golang.org/x/net/route/binary.go b/src/vendor/golang_org/x/net/route/binary.go index 4c561631b9..4c561631b9 100644 --- a/src/vendor/golang.org/x/net/route/binary.go +++ b/src/vendor/golang_org/x/net/route/binary.go diff --git a/src/vendor/golang.org/x/net/route/defs_darwin.go b/src/vendor/golang_org/x/net/route/defs_darwin.go index f452ad14ce..f452ad14ce 100644 --- a/src/vendor/golang.org/x/net/route/defs_darwin.go +++ b/src/vendor/golang_org/x/net/route/defs_darwin.go diff --git a/src/vendor/golang.org/x/net/route/defs_dragonfly.go b/src/vendor/golang_org/x/net/route/defs_dragonfly.go index c737751d76..c737751d76 100644 --- a/src/vendor/golang.org/x/net/route/defs_dragonfly.go +++ b/src/vendor/golang_org/x/net/route/defs_dragonfly.go diff --git a/src/vendor/golang.org/x/net/route/defs_freebsd.go b/src/vendor/golang_org/x/net/route/defs_freebsd.go index 8f834e81db..8f834e81db 100644 --- a/src/vendor/golang.org/x/net/route/defs_freebsd.go +++ b/src/vendor/golang_org/x/net/route/defs_freebsd.go diff --git a/src/vendor/golang.org/x/net/route/defs_netbsd.go b/src/vendor/golang_org/x/net/route/defs_netbsd.go index b18d85e016..b18d85e016 100644 --- a/src/vendor/golang.org/x/net/route/defs_netbsd.go +++ b/src/vendor/golang_org/x/net/route/defs_netbsd.go diff --git a/src/vendor/golang.org/x/net/route/defs_openbsd.go b/src/vendor/golang_org/x/net/route/defs_openbsd.go index 5df7a43bc3..5df7a43bc3 100644 --- a/src/vendor/golang.org/x/net/route/defs_openbsd.go +++ b/src/vendor/golang_org/x/net/route/defs_openbsd.go diff --git a/src/vendor/golang.org/x/net/route/interface.go b/src/vendor/golang_org/x/net/route/interface.go index 854906d9c4..854906d9c4 100644 --- a/src/vendor/golang.org/x/net/route/interface.go +++ b/src/vendor/golang_org/x/net/route/interface.go diff --git a/src/vendor/golang.org/x/net/route/interface_announce.go b/src/vendor/golang_org/x/net/route/interface_announce.go index 520d657b57..520d657b57 100644 --- a/src/vendor/golang.org/x/net/route/interface_announce.go +++ b/src/vendor/golang_org/x/net/route/interface_announce.go diff --git a/src/vendor/golang.org/x/net/route/interface_classic.go b/src/vendor/golang_org/x/net/route/interface_classic.go index ac4e7a6805..ac4e7a6805 100644 --- a/src/vendor/golang.org/x/net/route/interface_classic.go +++ b/src/vendor/golang_org/x/net/route/interface_classic.go diff --git a/src/vendor/golang.org/x/net/route/interface_freebsd.go b/src/vendor/golang_org/x/net/route/interface_freebsd.go index c83053915d..c83053915d 100644 --- a/src/vendor/golang.org/x/net/route/interface_freebsd.go +++ b/src/vendor/golang_org/x/net/route/interface_freebsd.go diff --git a/src/vendor/golang.org/x/net/route/interface_multicast.go b/src/vendor/golang_org/x/net/route/interface_multicast.go index 1e99a9cc64..1e99a9cc64 100644 --- a/src/vendor/golang.org/x/net/route/interface_multicast.go +++ b/src/vendor/golang_org/x/net/route/interface_multicast.go diff --git a/src/vendor/golang.org/x/net/route/interface_openbsd.go b/src/vendor/golang_org/x/net/route/interface_openbsd.go index 24451d8ca1..24451d8ca1 100644 --- a/src/vendor/golang.org/x/net/route/interface_openbsd.go +++ b/src/vendor/golang_org/x/net/route/interface_openbsd.go diff --git a/src/vendor/golang.org/x/net/route/message.go b/src/vendor/golang_org/x/net/route/message.go index 27cbf6b77a..27cbf6b77a 100644 --- a/src/vendor/golang.org/x/net/route/message.go +++ b/src/vendor/golang_org/x/net/route/message.go diff --git a/src/vendor/golang.org/x/net/route/message_darwin_test.go b/src/vendor/golang_org/x/net/route/message_darwin_test.go index 3fdd12df55..3fdd12df55 100644 --- a/src/vendor/golang.org/x/net/route/message_darwin_test.go +++ b/src/vendor/golang_org/x/net/route/message_darwin_test.go diff --git a/src/vendor/golang.org/x/net/route/message_freebsd_test.go b/src/vendor/golang_org/x/net/route/message_freebsd_test.go index 785c273f65..785c273f65 100644 --- a/src/vendor/golang.org/x/net/route/message_freebsd_test.go +++ b/src/vendor/golang_org/x/net/route/message_freebsd_test.go diff --git a/src/vendor/golang.org/x/net/route/message_test.go b/src/vendor/golang_org/x/net/route/message_test.go index a1263d8f25..a1263d8f25 100644 --- a/src/vendor/golang.org/x/net/route/message_test.go +++ b/src/vendor/golang_org/x/net/route/message_test.go diff --git a/src/vendor/golang.org/x/net/route/route.go b/src/vendor/golang_org/x/net/route/route.go index c986e29ebc..c986e29ebc 100644 --- a/src/vendor/golang.org/x/net/route/route.go +++ b/src/vendor/golang_org/x/net/route/route.go diff --git a/src/vendor/golang.org/x/net/route/route_classic.go b/src/vendor/golang_org/x/net/route/route_classic.go index d333c6aa52..d333c6aa52 100644 --- a/src/vendor/golang.org/x/net/route/route_classic.go +++ b/src/vendor/golang_org/x/net/route/route_classic.go diff --git a/src/vendor/golang.org/x/net/route/route_openbsd.go b/src/vendor/golang_org/x/net/route/route_openbsd.go index b07862f04d..b07862f04d 100644 --- a/src/vendor/golang.org/x/net/route/route_openbsd.go +++ b/src/vendor/golang_org/x/net/route/route_openbsd.go diff --git a/src/vendor/golang.org/x/net/route/route_test.go b/src/vendor/golang_org/x/net/route/route_test.go index 99f57b712d..99f57b712d 100644 --- a/src/vendor/golang.org/x/net/route/route_test.go +++ b/src/vendor/golang_org/x/net/route/route_test.go diff --git a/src/vendor/golang.org/x/net/route/sys.go b/src/vendor/golang_org/x/net/route/sys.go index 80ca83ae13..80ca83ae13 100644 --- a/src/vendor/golang.org/x/net/route/sys.go +++ b/src/vendor/golang_org/x/net/route/sys.go diff --git a/src/vendor/golang.org/x/net/route/sys_darwin.go b/src/vendor/golang_org/x/net/route/sys_darwin.go index fff3a0fd1d..fff3a0fd1d 100644 --- a/src/vendor/golang.org/x/net/route/sys_darwin.go +++ b/src/vendor/golang_org/x/net/route/sys_darwin.go diff --git a/src/vendor/golang.org/x/net/route/sys_dragonfly.go b/src/vendor/golang_org/x/net/route/sys_dragonfly.go index da848b3d07..da848b3d07 100644 --- a/src/vendor/golang.org/x/net/route/sys_dragonfly.go +++ b/src/vendor/golang_org/x/net/route/sys_dragonfly.go diff --git a/src/vendor/golang.org/x/net/route/sys_freebsd.go b/src/vendor/golang_org/x/net/route/sys_freebsd.go index 7b05c1a5a0..7b05c1a5a0 100644 --- a/src/vendor/golang.org/x/net/route/sys_freebsd.go +++ b/src/vendor/golang_org/x/net/route/sys_freebsd.go diff --git a/src/vendor/golang.org/x/net/route/sys_netbsd.go b/src/vendor/golang_org/x/net/route/sys_netbsd.go index 4d8076b518..4d8076b518 100644 --- a/src/vendor/golang.org/x/net/route/sys_netbsd.go +++ b/src/vendor/golang_org/x/net/route/sys_netbsd.go diff --git a/src/vendor/golang.org/x/net/route/sys_openbsd.go b/src/vendor/golang_org/x/net/route/sys_openbsd.go index 26d0438696..26d0438696 100644 --- a/src/vendor/golang.org/x/net/route/sys_openbsd.go +++ b/src/vendor/golang_org/x/net/route/sys_openbsd.go diff --git a/src/vendor/golang.org/x/net/route/syscall.go b/src/vendor/golang_org/x/net/route/syscall.go index d136325a30..d136325a30 100644 --- a/src/vendor/golang.org/x/net/route/syscall.go +++ b/src/vendor/golang_org/x/net/route/syscall.go diff --git a/src/vendor/golang.org/x/net/route/syscall.s b/src/vendor/golang_org/x/net/route/syscall.s index fa6297f0aa..fa6297f0aa 100644 --- a/src/vendor/golang.org/x/net/route/syscall.s +++ b/src/vendor/golang_org/x/net/route/syscall.s diff --git a/src/vendor/golang.org/x/net/route/zsys_darwin.go b/src/vendor/golang_org/x/net/route/zsys_darwin.go index 265b81cd50..265b81cd50 100644 --- a/src/vendor/golang.org/x/net/route/zsys_darwin.go +++ b/src/vendor/golang_org/x/net/route/zsys_darwin.go diff --git a/src/vendor/golang.org/x/net/route/zsys_dragonfly.go b/src/vendor/golang_org/x/net/route/zsys_dragonfly.go index dd36dece0f..dd36dece0f 100644 --- a/src/vendor/golang.org/x/net/route/zsys_dragonfly.go +++ b/src/vendor/golang_org/x/net/route/zsys_dragonfly.go diff --git a/src/vendor/golang.org/x/net/route/zsys_freebsd_386.go b/src/vendor/golang_org/x/net/route/zsys_freebsd_386.go index 9bac2e3900..9bac2e3900 100644 --- a/src/vendor/golang.org/x/net/route/zsys_freebsd_386.go +++ b/src/vendor/golang_org/x/net/route/zsys_freebsd_386.go diff --git a/src/vendor/golang.org/x/net/route/zsys_freebsd_amd64.go b/src/vendor/golang_org/x/net/route/zsys_freebsd_amd64.go index b1920d7ac1..b1920d7ac1 100644 --- a/src/vendor/golang.org/x/net/route/zsys_freebsd_amd64.go +++ b/src/vendor/golang_org/x/net/route/zsys_freebsd_amd64.go diff --git a/src/vendor/golang.org/x/net/route/zsys_freebsd_arm.go b/src/vendor/golang_org/x/net/route/zsys_freebsd_arm.go index a034d6fcbf..a034d6fcbf 100644 --- a/src/vendor/golang.org/x/net/route/zsys_freebsd_arm.go +++ b/src/vendor/golang_org/x/net/route/zsys_freebsd_arm.go diff --git a/src/vendor/golang.org/x/net/route/zsys_netbsd.go b/src/vendor/golang_org/x/net/route/zsys_netbsd.go index aa4aad1613..aa4aad1613 100644 --- a/src/vendor/golang.org/x/net/route/zsys_netbsd.go +++ b/src/vendor/golang_org/x/net/route/zsys_netbsd.go diff --git a/src/vendor/golang.org/x/net/route/zsys_openbsd.go b/src/vendor/golang_org/x/net/route/zsys_openbsd.go index 4fadc4e8fa..4fadc4e8fa 100644 --- a/src/vendor/golang.org/x/net/route/zsys_openbsd.go +++ b/src/vendor/golang_org/x/net/route/zsys_openbsd.go |