]> Cypherpunks.ru repositories - gostls13.git/commitdiff
vendor/golang_org/x: move to internal/x
authorBryan C. Mills <bcmills@google.com>
Mon, 5 Nov 2018 20:01:53 +0000 (15:01 -0500)
committerBryan C. Mills <bcmills@google.com>
Thu, 29 Nov 2018 15:42:16 +0000 (15:42 +0000)
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>
196 files changed:
src/cmd/api/goapi.go
src/cmd/go/go_test.go
src/cmd/go/internal/load/pkg.go
src/cmd/go/internal/modload/import.go
src/cmd/go/testdata/script/list_importmap.txt [new file with mode: 0644]
src/cmd/go/testdata/script/list_std.txt
src/cmd/go/testdata/script/mod_internal.txt
src/cmd/go/testdata/script/mod_std_vendor.txt
src/crypto/tls/cipher_suites.go
src/crypto/tls/handshake_messages.go
src/crypto/tls/key_schedule.go
src/crypto/tls/ticket.go
src/crypto/x509/x509.go
src/go/build/build_test.go
src/go/build/deps_test.go
src/go/build/testdata/withvendor/src/a/b/b.go [new file with mode: 0644]
src/go/build/testdata/withvendor/src/a/vendor/c/d/d.go [new file with mode: 0644]
src/go/internal/srcimporter/srcimporter_test.go
src/internal/x/crypto/chacha20poly1305/chacha20poly1305.go [moved from src/vendor/golang_org/x/crypto/chacha20poly1305/chacha20poly1305.go with 97% similarity]
src/internal/x/crypto/chacha20poly1305/chacha20poly1305_amd64.go [moved from src/vendor/golang_org/x/crypto/chacha20poly1305/chacha20poly1305_amd64.go with 100% similarity]
src/internal/x/crypto/chacha20poly1305/chacha20poly1305_amd64.s [moved from src/vendor/golang_org/x/crypto/chacha20poly1305/chacha20poly1305_amd64.s with 100% similarity]
src/internal/x/crypto/chacha20poly1305/chacha20poly1305_generic.go [moved from src/vendor/golang_org/x/crypto/chacha20poly1305/chacha20poly1305_generic.go with 96% similarity]
src/internal/x/crypto/chacha20poly1305/chacha20poly1305_noasm.go [moved from src/vendor/golang_org/x/crypto/chacha20poly1305/chacha20poly1305_noasm.go with 100% similarity]
src/internal/x/crypto/chacha20poly1305/chacha20poly1305_test.go [moved from src/vendor/golang_org/x/crypto/chacha20poly1305/chacha20poly1305_test.go with 100% similarity]
src/internal/x/crypto/chacha20poly1305/chacha20poly1305_vectors_test.go [moved from src/vendor/golang_org/x/crypto/chacha20poly1305/chacha20poly1305_vectors_test.go with 100% similarity]
src/internal/x/crypto/cryptobyte/asn1.go [moved from src/vendor/golang_org/x/crypto/cryptobyte/asn1.go with 99% similarity]
src/internal/x/crypto/cryptobyte/asn1/asn1.go [moved from src/vendor/golang_org/x/crypto/cryptobyte/asn1/asn1.go with 96% similarity]
src/internal/x/crypto/cryptobyte/asn1_test.go [moved from src/vendor/golang_org/x/crypto/cryptobyte/asn1_test.go with 99% similarity]
src/internal/x/crypto/cryptobyte/builder.go [moved from src/vendor/golang_org/x/crypto/cryptobyte/builder.go with 100% similarity]
src/internal/x/crypto/cryptobyte/cryptobyte_test.go [moved from src/vendor/golang_org/x/crypto/cryptobyte/cryptobyte_test.go with 100% similarity]
src/internal/x/crypto/cryptobyte/example_test.go [moved from src/vendor/golang_org/x/crypto/cryptobyte/example_test.go with 98% similarity]
src/internal/x/crypto/cryptobyte/string.go [moved from src/vendor/golang_org/x/crypto/cryptobyte/string.go with 98% similarity]
src/internal/x/crypto/curve25519/const_amd64.h [moved from src/vendor/golang_org/x/crypto/curve25519/const_amd64.h with 100% similarity]
src/internal/x/crypto/curve25519/const_amd64.s [moved from src/vendor/golang_org/x/crypto/curve25519/const_amd64.s with 100% similarity]
src/internal/x/crypto/curve25519/cswap_amd64.s [moved from src/vendor/golang_org/x/crypto/curve25519/cswap_amd64.s with 100% similarity]
src/internal/x/crypto/curve25519/curve25519.go [moved from src/vendor/golang_org/x/crypto/curve25519/curve25519.go with 100% similarity]
src/internal/x/crypto/curve25519/curve25519_test.go [moved from src/vendor/golang_org/x/crypto/curve25519/curve25519_test.go with 100% similarity]
src/internal/x/crypto/curve25519/doc.go [moved from src/vendor/golang_org/x/crypto/curve25519/doc.go with 94% similarity]
src/internal/x/crypto/curve25519/freeze_amd64.s [moved from src/vendor/golang_org/x/crypto/curve25519/freeze_amd64.s with 100% similarity]
src/internal/x/crypto/curve25519/ladderstep_amd64.s [moved from src/vendor/golang_org/x/crypto/curve25519/ladderstep_amd64.s with 100% similarity]
src/internal/x/crypto/curve25519/mont25519_amd64.go [moved from src/vendor/golang_org/x/crypto/curve25519/mont25519_amd64.go with 100% similarity]
src/internal/x/crypto/curve25519/mul_amd64.s [moved from src/vendor/golang_org/x/crypto/curve25519/mul_amd64.s with 100% similarity]
src/internal/x/crypto/curve25519/square_amd64.s [moved from src/vendor/golang_org/x/crypto/curve25519/square_amd64.s with 100% similarity]
src/internal/x/crypto/hkdf/example_test.go [moved from src/vendor/golang_org/x/crypto/hkdf/example_test.go with 97% similarity]
src/internal/x/crypto/hkdf/hkdf.go [moved from src/vendor/golang_org/x/crypto/hkdf/hkdf.go with 98% similarity]
src/internal/x/crypto/hkdf/hkdf_test.go [moved from src/vendor/golang_org/x/crypto/hkdf/hkdf_test.go with 100% similarity]
src/internal/x/crypto/internal/chacha20/asm_s390x.s [moved from src/vendor/golang_org/x/crypto/internal/chacha20/asm_s390x.s with 100% similarity]
src/internal/x/crypto/internal/chacha20/chacha_generic.go [moved from src/vendor/golang_org/x/crypto/internal/chacha20/chacha_generic.go with 100% similarity]
src/internal/x/crypto/internal/chacha20/chacha_noasm.go [moved from src/vendor/golang_org/x/crypto/internal/chacha20/chacha_noasm.go with 100% similarity]
src/internal/x/crypto/internal/chacha20/chacha_s390x.go [moved from src/vendor/golang_org/x/crypto/internal/chacha20/chacha_s390x.go with 100% similarity]
src/internal/x/crypto/internal/chacha20/chacha_test.go [moved from src/vendor/golang_org/x/crypto/internal/chacha20/chacha_test.go with 100% similarity]
src/internal/x/crypto/internal/chacha20/vectors_test.go [moved from src/vendor/golang_org/x/crypto/internal/chacha20/vectors_test.go with 100% similarity]
src/internal/x/crypto/internal/chacha20/xor.go [moved from src/vendor/golang_org/x/crypto/internal/chacha20/xor.go with 100% similarity]
src/internal/x/crypto/poly1305/poly1305.go [moved from src/vendor/golang_org/x/crypto/poly1305/poly1305.go with 95% similarity]
src/internal/x/crypto/poly1305/poly1305_test.go [moved from src/vendor/golang_org/x/crypto/poly1305/poly1305_test.go with 100% similarity]
src/internal/x/crypto/poly1305/sum_amd64.go [moved from src/vendor/golang_org/x/crypto/poly1305/sum_amd64.go with 100% similarity]
src/internal/x/crypto/poly1305/sum_amd64.s [moved from src/vendor/golang_org/x/crypto/poly1305/sum_amd64.s with 100% similarity]
src/internal/x/crypto/poly1305/sum_arm.go [moved from src/vendor/golang_org/x/crypto/poly1305/sum_arm.go with 100% similarity]
src/internal/x/crypto/poly1305/sum_arm.s [moved from src/vendor/golang_org/x/crypto/poly1305/sum_arm.s with 100% similarity]
src/internal/x/crypto/poly1305/sum_noasm.go [moved from src/vendor/golang_org/x/crypto/poly1305/sum_noasm.go with 100% similarity]
src/internal/x/crypto/poly1305/sum_ref.go [moved from src/vendor/golang_org/x/crypto/poly1305/sum_ref.go with 100% similarity]
src/internal/x/crypto/poly1305/sum_s390x.go [moved from src/vendor/golang_org/x/crypto/poly1305/sum_s390x.go with 100% similarity]
src/internal/x/crypto/poly1305/sum_s390x.s [moved from src/vendor/golang_org/x/crypto/poly1305/sum_s390x.s with 100% similarity]
src/internal/x/crypto/poly1305/sum_vmsl_s390x.s [moved from src/vendor/golang_org/x/crypto/poly1305/sum_vmsl_s390x.s with 100% similarity]
src/internal/x/crypto/poly1305/vectors_test.go [moved from src/vendor/golang_org/x/crypto/poly1305/vectors_test.go with 100% similarity]
src/internal/x/fiximports.bash [new file with mode: 0755]
src/internal/x/net/dns/dnsmessage/example_test.go [moved from src/vendor/golang_org/x/net/dns/dnsmessage/example_test.go with 98% similarity]
src/internal/x/net/dns/dnsmessage/message.go [moved from src/vendor/golang_org/x/net/dns/dnsmessage/message.go with 100% similarity]
src/internal/x/net/dns/dnsmessage/message_test.go [moved from src/vendor/golang_org/x/net/dns/dnsmessage/message_test.go with 100% similarity]
src/internal/x/net/http/httpguts/guts.go [moved from src/vendor/golang_org/x/net/http/httpguts/guts.go with 100% similarity]
src/internal/x/net/http/httpguts/httplex.go [moved from src/vendor/golang_org/x/net/http/httpguts/httplex.go with 99% similarity]
src/internal/x/net/http/httpguts/httplex_test.go [moved from src/vendor/golang_org/x/net/http/httpguts/httplex_test.go with 100% similarity]
src/internal/x/net/http/httpproxy/export_test.go [moved from src/vendor/golang_org/x/net/http/httpproxy/export_test.go with 100% similarity]
src/internal/x/net/http/httpproxy/proxy.go [moved from src/vendor/golang_org/x/net/http/httpproxy/proxy.go with 99% similarity]
src/internal/x/net/http/httpproxy/proxy_test.go [moved from src/vendor/golang_org/x/net/http/httpproxy/proxy_test.go with 99% similarity]
src/internal/x/net/http2/hpack/encode.go [moved from src/vendor/golang_org/x/net/http2/hpack/encode.go with 100% similarity]
src/internal/x/net/http2/hpack/encode_test.go [moved from src/vendor/golang_org/x/net/http2/hpack/encode_test.go with 100% similarity]
src/internal/x/net/http2/hpack/hpack.go [moved from src/vendor/golang_org/x/net/http2/hpack/hpack.go with 100% similarity]
src/internal/x/net/http2/hpack/hpack_test.go [moved from src/vendor/golang_org/x/net/http2/hpack/hpack_test.go with 100% similarity]
src/internal/x/net/http2/hpack/huffman.go [moved from src/vendor/golang_org/x/net/http2/hpack/huffman.go with 100% similarity]
src/internal/x/net/http2/hpack/tables.go [moved from src/vendor/golang_org/x/net/http2/hpack/tables.go with 100% similarity]
src/internal/x/net/http2/hpack/tables_test.go [moved from src/vendor/golang_org/x/net/http2/hpack/tables_test.go with 100% similarity]
src/internal/x/net/idna/idna.go [moved from src/vendor/golang_org/x/net/idna/idna.go with 99% similarity]
src/internal/x/net/idna/punycode.go [moved from src/vendor/golang_org/x/net/idna/punycode.go with 100% similarity]
src/internal/x/net/idna/punycode_test.go [moved from src/vendor/golang_org/x/net/idna/punycode_test.go with 100% similarity]
src/internal/x/net/idna/tables.go [moved from src/vendor/golang_org/x/net/idna/tables.go with 99% similarity]
src/internal/x/net/idna/trie.go [moved from src/vendor/golang_org/x/net/idna/trie.go with 100% similarity]
src/internal/x/net/idna/trieval.go [moved from src/vendor/golang_org/x/net/idna/trieval.go with 97% similarity]
src/internal/x/net/internal/nettest/helper_bsd.go [moved from src/vendor/golang_org/x/net/internal/nettest/helper_bsd.go with 100% similarity]
src/internal/x/net/internal/nettest/helper_nobsd.go [moved from src/vendor/golang_org/x/net/internal/nettest/helper_nobsd.go with 100% similarity]
src/internal/x/net/internal/nettest/helper_posix.go [moved from src/vendor/golang_org/x/net/internal/nettest/helper_posix.go with 100% similarity]
src/internal/x/net/internal/nettest/helper_stub.go [moved from src/vendor/golang_org/x/net/internal/nettest/helper_stub.go with 100% similarity]
src/internal/x/net/internal/nettest/helper_unix.go [moved from src/vendor/golang_org/x/net/internal/nettest/helper_unix.go with 100% similarity]
src/internal/x/net/internal/nettest/helper_windows.go [moved from src/vendor/golang_org/x/net/internal/nettest/helper_windows.go with 100% similarity]
src/internal/x/net/internal/nettest/interface.go [moved from src/vendor/golang_org/x/net/internal/nettest/interface.go with 100% similarity]
src/internal/x/net/internal/nettest/rlimit.go [moved from src/vendor/golang_org/x/net/internal/nettest/rlimit.go with 100% similarity]
src/internal/x/net/internal/nettest/stack.go [moved from src/vendor/golang_org/x/net/internal/nettest/stack.go with 98% similarity]
src/internal/x/net/lif/address.go [moved from src/vendor/golang_org/x/net/lif/address.go with 100% similarity]
src/internal/x/net/lif/address_test.go [moved from src/vendor/golang_org/x/net/lif/address_test.go with 100% similarity]
src/internal/x/net/lif/binary.go [moved from src/vendor/golang_org/x/net/lif/binary.go with 100% similarity]
src/internal/x/net/lif/defs_solaris.go [moved from src/vendor/golang_org/x/net/lif/defs_solaris.go with 100% similarity]
src/internal/x/net/lif/lif.go [moved from src/vendor/golang_org/x/net/lif/lif.go with 100% similarity]
src/internal/x/net/lif/link.go [moved from src/vendor/golang_org/x/net/lif/link.go with 100% similarity]
src/internal/x/net/lif/link_test.go [moved from src/vendor/golang_org/x/net/lif/link_test.go with 100% similarity]
src/internal/x/net/lif/sys.go [moved from src/vendor/golang_org/x/net/lif/sys.go with 100% similarity]
src/internal/x/net/lif/sys_solaris_amd64.s [moved from src/vendor/golang_org/x/net/lif/sys_solaris_amd64.s with 100% similarity]
src/internal/x/net/lif/syscall.go [moved from src/vendor/golang_org/x/net/lif/syscall.go with 100% similarity]
src/internal/x/net/lif/zsys_solaris_amd64.go [moved from src/vendor/golang_org/x/net/lif/zsys_solaris_amd64.go with 100% similarity]
src/internal/x/net/nettest/conntest.go [moved from src/vendor/golang_org/x/net/nettest/conntest.go with 100% similarity]
src/internal/x/net/nettest/conntest_go16.go [moved from src/vendor/golang_org/x/net/nettest/conntest_go16.go with 100% similarity]
src/internal/x/net/nettest/conntest_go17.go [moved from src/vendor/golang_org/x/net/nettest/conntest_go17.go with 100% similarity]
src/internal/x/net/nettest/conntest_test.go [moved from src/vendor/golang_org/x/net/nettest/conntest_test.go with 97% similarity]
src/internal/x/net/route/address.go [moved from src/vendor/golang_org/x/net/route/address.go with 100% similarity]
src/internal/x/net/route/address_darwin_test.go [moved from src/vendor/golang_org/x/net/route/address_darwin_test.go with 100% similarity]
src/internal/x/net/route/address_test.go [moved from src/vendor/golang_org/x/net/route/address_test.go with 100% similarity]
src/internal/x/net/route/binary.go [moved from src/vendor/golang_org/x/net/route/binary.go with 100% similarity]
src/internal/x/net/route/defs_darwin.go [moved from src/vendor/golang_org/x/net/route/defs_darwin.go with 100% similarity]
src/internal/x/net/route/defs_dragonfly.go [moved from src/vendor/golang_org/x/net/route/defs_dragonfly.go with 100% similarity]
src/internal/x/net/route/defs_freebsd.go [moved from src/vendor/golang_org/x/net/route/defs_freebsd.go with 100% similarity]
src/internal/x/net/route/defs_netbsd.go [moved from src/vendor/golang_org/x/net/route/defs_netbsd.go with 100% similarity]
src/internal/x/net/route/defs_openbsd.go [moved from src/vendor/golang_org/x/net/route/defs_openbsd.go with 100% similarity]
src/internal/x/net/route/empty.s [moved from src/vendor/golang_org/x/net/route/empty.s with 100% similarity]
src/internal/x/net/route/interface.go [moved from src/vendor/golang_org/x/net/route/interface.go with 100% similarity]
src/internal/x/net/route/interface_announce.go [moved from src/vendor/golang_org/x/net/route/interface_announce.go with 100% similarity]
src/internal/x/net/route/interface_classic.go [moved from src/vendor/golang_org/x/net/route/interface_classic.go with 100% similarity]
src/internal/x/net/route/interface_freebsd.go [moved from src/vendor/golang_org/x/net/route/interface_freebsd.go with 100% similarity]
src/internal/x/net/route/interface_multicast.go [moved from src/vendor/golang_org/x/net/route/interface_multicast.go with 100% similarity]
src/internal/x/net/route/interface_openbsd.go [moved from src/vendor/golang_org/x/net/route/interface_openbsd.go with 100% similarity]
src/internal/x/net/route/message.go [moved from src/vendor/golang_org/x/net/route/message.go with 100% similarity]
src/internal/x/net/route/message_darwin_test.go [moved from src/vendor/golang_org/x/net/route/message_darwin_test.go with 100% similarity]
src/internal/x/net/route/message_freebsd_test.go [moved from src/vendor/golang_org/x/net/route/message_freebsd_test.go with 100% similarity]
src/internal/x/net/route/message_test.go [moved from src/vendor/golang_org/x/net/route/message_test.go with 100% similarity]
src/internal/x/net/route/route.go [moved from src/vendor/golang_org/x/net/route/route.go with 100% similarity]
src/internal/x/net/route/route_classic.go [moved from src/vendor/golang_org/x/net/route/route_classic.go with 100% similarity]
src/internal/x/net/route/route_openbsd.go [moved from src/vendor/golang_org/x/net/route/route_openbsd.go with 100% similarity]
src/internal/x/net/route/route_test.go [moved from src/vendor/golang_org/x/net/route/route_test.go with 100% similarity]
src/internal/x/net/route/sys.go [moved from src/vendor/golang_org/x/net/route/sys.go with 100% similarity]
src/internal/x/net/route/sys_darwin.go [moved from src/vendor/golang_org/x/net/route/sys_darwin.go with 100% similarity]
src/internal/x/net/route/sys_dragonfly.go [moved from src/vendor/golang_org/x/net/route/sys_dragonfly.go with 100% similarity]
src/internal/x/net/route/sys_freebsd.go [moved from src/vendor/golang_org/x/net/route/sys_freebsd.go with 100% similarity]
src/internal/x/net/route/sys_netbsd.go [moved from src/vendor/golang_org/x/net/route/sys_netbsd.go with 100% similarity]
src/internal/x/net/route/sys_openbsd.go [moved from src/vendor/golang_org/x/net/route/sys_openbsd.go with 100% similarity]
src/internal/x/net/route/syscall.go [moved from src/vendor/golang_org/x/net/route/syscall.go with 100% similarity]
src/internal/x/net/route/syscall_go1_11_darwin.go [moved from src/vendor/golang_org/x/net/route/syscall_go1_11_darwin.go with 100% similarity]
src/internal/x/net/route/syscall_go1_12_darwin.go [moved from src/vendor/golang_org/x/net/route/syscall_go1_12_darwin.go with 100% similarity]
src/internal/x/net/route/zsys_darwin.go [moved from src/vendor/golang_org/x/net/route/zsys_darwin.go with 100% similarity]
src/internal/x/net/route/zsys_dragonfly.go [moved from src/vendor/golang_org/x/net/route/zsys_dragonfly.go with 100% similarity]
src/internal/x/net/route/zsys_freebsd_386.go [moved from src/vendor/golang_org/x/net/route/zsys_freebsd_386.go with 100% similarity]
src/internal/x/net/route/zsys_freebsd_amd64.go [moved from src/vendor/golang_org/x/net/route/zsys_freebsd_amd64.go with 100% similarity]
src/internal/x/net/route/zsys_freebsd_arm.go [moved from src/vendor/golang_org/x/net/route/zsys_freebsd_arm.go with 100% similarity]
src/internal/x/net/route/zsys_netbsd.go [moved from src/vendor/golang_org/x/net/route/zsys_netbsd.go with 100% similarity]
src/internal/x/net/route/zsys_openbsd.go [moved from src/vendor/golang_org/x/net/route/zsys_openbsd.go with 100% similarity]
src/internal/x/text/secure/bidirule/bidirule.go [moved from src/vendor/golang_org/x/text/secure/bidirule/bidirule.go with 99% similarity]
src/internal/x/text/secure/doc.go [moved from src/vendor/golang_org/x/text/secure/doc.go with 85% similarity]
src/internal/x/text/transform/examples_test.go [moved from src/vendor/golang_org/x/text/transform/examples_test.go with 92% similarity]
src/internal/x/text/transform/transform.go [moved from src/vendor/golang_org/x/text/transform/transform.go with 99% similarity]
src/internal/x/text/unicode/bidi/bidi.go [moved from src/vendor/golang_org/x/text/unicode/bidi/bidi.go with 99% similarity]
src/internal/x/text/unicode/bidi/bracket.go [moved from src/vendor/golang_org/x/text/unicode/bidi/bracket.go with 100% similarity]
src/internal/x/text/unicode/bidi/core.go [moved from src/vendor/golang_org/x/text/unicode/bidi/core.go with 100% similarity]
src/internal/x/text/unicode/bidi/example_test.go [moved from src/vendor/golang_org/x/text/unicode/bidi/example_test.go with 99% similarity]
src/internal/x/text/unicode/bidi/prop.go [moved from src/vendor/golang_org/x/text/unicode/bidi/prop.go with 100% similarity]
src/internal/x/text/unicode/bidi/tables.go [moved from src/vendor/golang_org/x/text/unicode/bidi/tables.go with 99% similarity]
src/internal/x/text/unicode/bidi/trieval.go [moved from src/vendor/golang_org/x/text/unicode/bidi/trieval.go with 95% similarity]
src/internal/x/text/unicode/doc.go [moved from src/vendor/golang_org/x/text/unicode/doc.go with 84% similarity]
src/internal/x/text/unicode/norm/composition.go [moved from src/vendor/golang_org/x/text/unicode/norm/composition.go with 100% similarity]
src/internal/x/text/unicode/norm/example_iter_test.go [moved from src/vendor/golang_org/x/text/unicode/norm/example_iter_test.go with 98% similarity]
src/internal/x/text/unicode/norm/example_test.go [moved from src/vendor/golang_org/x/text/unicode/norm/example_test.go with 94% similarity]
src/internal/x/text/unicode/norm/forminfo.go [moved from src/vendor/golang_org/x/text/unicode/norm/forminfo.go with 100% similarity]
src/internal/x/text/unicode/norm/input.go [moved from src/vendor/golang_org/x/text/unicode/norm/input.go with 100% similarity]
src/internal/x/text/unicode/norm/iter.go [moved from src/vendor/golang_org/x/text/unicode/norm/iter.go with 100% similarity]
src/internal/x/text/unicode/norm/normalize.go [moved from src/vendor/golang_org/x/text/unicode/norm/normalize.go with 99% similarity]
src/internal/x/text/unicode/norm/readwriter.go [moved from src/vendor/golang_org/x/text/unicode/norm/readwriter.go with 100% similarity]
src/internal/x/text/unicode/norm/tables.go [moved from src/vendor/golang_org/x/text/unicode/norm/tables.go with 99% similarity]
src/internal/x/text/unicode/norm/transform.go [moved from src/vendor/golang_org/x/text/unicode/norm/transform.go with 98% similarity]
src/internal/x/text/unicode/norm/trie.go [moved from src/vendor/golang_org/x/text/unicode/norm/trie.go with 100% similarity]
src/internal/x/text/unicode/norm/triegen.go [moved from src/vendor/golang_org/x/text/unicode/norm/triegen.go with 100% similarity]
src/net/dnsclient.go
src/net/dnsclient_unix.go
src/net/dnsclient_unix_test.go
src/net/http/h2_bundle.go
src/net/http/http.go
src/net/http/httptest/recorder.go
src/net/http/httputil/reverseproxy.go
src/net/http/request.go
src/net/http/response.go
src/net/http/server.go
src/net/http/transfer.go
src/net/http/transport.go
src/net/http/transport_test.go
src/net/interface_bsd.go
src/net/interface_bsdvar.go
src/net/interface_darwin.go
src/net/interface_freebsd.go
src/net/interface_solaris.go
src/net/lookup_unix.go
src/net/pipe_test.go

index 9698f25b512b7444784739e1c6f8c9c41262ebda..02dfa7c84128212dd38816cc6ff104bfcf4a2b4e 100644 (file)
@@ -442,13 +442,8 @@ func (w *Walker) Import(name string) (*types.Package, error) {
        }
        w.imported[name] = &importing
 
-       root := w.root
-       if strings.HasPrefix(name, "golang_org/x/") {
-               root = filepath.Join(root, "vendor")
-       }
-
        // Determine package files.
-       dir := filepath.Join(root, filepath.FromSlash(name))
+       dir := filepath.Join(w.root, filepath.FromSlash(name))
        if fi, err := os.Stat(dir); err != nil || !fi.IsDir() {
                log.Fatalf("no source in tree for import %q: %v", name, err)
        }
index f956ecb9163fc9c741ba2efbd69665588469ef03..6c31f9841500f151b38875658c49e96d5514938f 100644 (file)
@@ -1207,22 +1207,6 @@ func TestImportCycle(t *testing.T) {
        tg.run("list", "-e", "-json", "selfimport")
 }
 
-func TestListImportMap(t *testing.T) {
-       skipIfGccgo(t, "gccgo does not have standard packages")
-       tg := testgo(t)
-       defer tg.cleanup()
-       tg.parallel()
-       tg.run("list", "-f", "{{.ImportPath}}: {{.ImportMap}}", "net", "fmt")
-       tg.grepStdout(`^net: map\[(.* )?golang_org/x/net/dns/dnsmessage:vendor/golang_org/x/net/dns/dnsmessage.*\]`, "net/http should have rewritten dnsmessage import")
-       tg.grepStdout(`^fmt: map\[\]`, "fmt should have no rewritten imports")
-       tg.run("list", "-deps", "-test", "-f", "{{.ImportPath}} MAP: {{.ImportMap}}\n{{.ImportPath}} IMPORT: {{.Imports}}", "fmt")
-       tg.grepStdout(`^flag \[fmt\.test\] MAP: map\[fmt:fmt \[fmt\.test\]\]`, "flag [fmt.test] should import fmt [fmt.test] as fmt")
-       tg.grepStdout(`^fmt\.test MAP: map\[(.* )?testing:testing \[fmt\.test\]`, "fmt.test should import testing [fmt.test] as testing")
-       tg.grepStdout(`^fmt\.test MAP: map\[(.* )?testing:testing \[fmt\.test\]`, "fmt.test should import testing [fmt.test] as testing")
-       tg.grepStdoutNot(`^fmt\.test MAP: map\[(.* )?os:`, "fmt.test should not import a modified os")
-       tg.grepStdout(`^fmt\.test IMPORT: \[fmt \[fmt\.test\] fmt_test \[fmt\.test\] os testing \[fmt\.test\] testing/internal/testdeps \[fmt\.test\]\]`, "wrong imports for fmt.test")
-}
-
 // cmd/go: custom import path checking should not apply to Go packages without import comment.
 func TestIssue10952(t *testing.T) {
        testenv.MustHaveExternalNetwork(t)
index ae738c6a12e5266fae26970eb29c867ec710fdbd..a64bab1479cbbb85a0fd322a871d936575f11bc6 100644 (file)
@@ -1051,20 +1051,6 @@ func disallowVendor(srcDir string, importer *Package, importerPath, path string,
                return p
        }
 
-       // Modules must not import vendor packages in the standard library,
-       // but the usual vendor visibility check will not catch them
-       // because the module loader presents them with an ImportPath starting
-       // with "golang_org/" instead of "vendor/".
-       if p.Standard && !importer.Standard && strings.HasPrefix(p.ImportPath, "golang_org") {
-               perr := *p
-               perr.Error = &PackageError{
-                       ImportStack: stk.Copy(),
-                       Err:         "use of vendored package " + path + " not allowed",
-               }
-               perr.Incomplete = true
-               return &perr
-       }
-
        if perr := disallowVendorVisibility(srcDir, p, stk); perr != p {
                return perr
        }
index 44c2a2372670b5c50eb008db4a8b6769d0ec0481..ba2052d3cdd598dfee8655fbb2f4794e2ace1958 100644 (file)
@@ -58,9 +58,6 @@ func Import(path string) (m module.Version, dir string, err error) {
 
        // Is the package in the standard library?
        if search.IsStandardImportPath(path) {
-               if strings.HasPrefix(path, "golang_org/") {
-                       return module.Version{}, filepath.Join(cfg.GOROOT, "src/vendor", path), nil
-               }
                if goroot.IsStandardPackage(cfg.GOROOT, cfg.BuildContext.Compiler, path) {
                        dir := filepath.Join(cfg.GOROOT, "src", path)
                        return module.Version{}, dir, nil
diff --git a/src/cmd/go/testdata/script/list_importmap.txt b/src/cmd/go/testdata/script/list_importmap.txt
new file mode 100644 (file)
index 0000000..a42dc47
--- /dev/null
@@ -0,0 +1,25 @@
+# gccgo does not have standard packages.
+[gccgo] skip
+
+# fmt should have no rewritten imports.
+# The import from a/b should map c/d to a's vendor directory.
+go list -f '{{.ImportPath}}: {{.ImportMap}}' fmt a/b
+stdout 'fmt: map\[\]'
+stdout 'a/b: map\[c/d:a/vendor/c/d\]'
+
+# flag [fmt.test] should import fmt [fmt.test] as fmt
+# fmt.test should import testing [fmt.test] as testing
+# fmt.test should not import a modified os
+go list -deps -test -f '{{.ImportPath}} MAP: {{.ImportMap}}{{"\n"}}{{.ImportPath}} IMPORT: {{.Imports}}' fmt
+stdout '^flag \[fmt\.test\] MAP: map\[fmt:fmt \[fmt\.test\]\]'
+stdout '^fmt\.test MAP: map\[(.* )?testing:testing \[fmt\.test\]'
+! stdout '^fmt\.test MAP: map\[(.* )?os:'
+stdout '^fmt\.test IMPORT: \[fmt \[fmt\.test\] fmt_test \[fmt\.test\] os testing \[fmt\.test\] testing/internal/testdeps \[fmt\.test\]\]'
+
+
+-- a/b/b.go --
+package b
+
+import _ "c/d"
+-- a/vendor/c/d/d.go --
+package d
index a63d74db1205a4a905e319eb59b195ce0625163e..046bec6ac54b054e817539e6efa8d137276c937b 100644 (file)
@@ -8,5 +8,5 @@ go list -f '{{if not .Standard}}{{.ImportPath}}{{end}}' ./...
 
 # our vendored packages should be reported as standard
 go list std cmd
-stdout golang_org/x/net/http2/hpack
+stdout internal/x/net/http2/hpack
 stdout cmd/vendor/golang\.org/x/arch/x86/x86asm
index e5f5a1205ee76dff03028ab3f43ec7ae811f66e9..5a47c3fa44ae6c78e9840b1bd61c76722af37c3d 100644 (file)
@@ -18,15 +18,6 @@ stderr 'use of internal package golang.org/x/.* not allowed'
 ! go build ./fromstd
 stderr 'use of internal package internal/testenv not allowed'
 
-# Packages found via standard-library vendoring should not leak.
-! go build ./fromstdvendor
-stderr 'use of vendored package golang_org/x/net/http/httpguts not allowed'
-
-env GO111MODULE=off
-! go build ./fromstdvendor
-stderr 'cannot find package "golang_org/x/net/http/httpguts" in any of:'
-env GO111MODULE=on
-
 # Dependencies should be able to use their own internal modules...
 rm go.mod
 go mod init golang.org/notx
@@ -83,10 +74,6 @@ import _ "golang.org/notx/useinternal"
 package fromstd
 import _ "internal/testenv"
 
--- fromstdvendor/useinternal.go --
-package fromstdvendor
-import _ "golang_org/x/net/http/httpguts"
-
 -- replace/golang.org/notx/internal/go.mod --
 module golang.org/x/internal
 
index 36d4ffca9eca52919ac73bffc4385c254bc34ae8..7aa1bc353be857f6dbeea4df2840d9e914493377 100644 (file)
@@ -4,7 +4,7 @@ go list -f '{{.TestImports}}'
 stdout net/http # from .TestImports
 
 go list -test -f '{{.Deps}}'
-stdout golang_org/x/crypto # dep of .TestImports
+stdout internal/x/crypto # dep of .TestImports
 
 -- go.mod --
 module m
index 26e14c992489412682a3db1f2fbf7444cd562bcd..ecb4db290a0f8df5777fa730e87e04d23d9eb9ed 100644 (file)
@@ -14,8 +14,8 @@ import (
        "crypto/sha1"
        "crypto/sha256"
        "crypto/x509"
-       "golang_org/x/crypto/chacha20poly1305"
        "hash"
+       "internal/x/crypto/chacha20poly1305"
 )
 
 // a keyAgreement implements the client and server side of a TLS key agreement
index f86cc4b9b03996255ded4a5a8d47114ccee06277..c0e049b16f0ed272420c81a74bc8bd9cadb2054c 100644 (file)
@@ -6,7 +6,7 @@ package tls
 
 import (
        "fmt"
-       "golang_org/x/crypto/cryptobyte"
+       "internal/x/crypto/cryptobyte"
        "strings"
 )
 
index 310d92e2c5e3a51d46fd5edd18a49e344f6be6b2..2cfc226d7f6e9ee1c9bacddf3afd82199d8a366e 100644 (file)
@@ -8,10 +8,10 @@ import (
        "crypto/elliptic"
        "crypto/hmac"
        "errors"
-       "golang_org/x/crypto/cryptobyte"
-       "golang_org/x/crypto/curve25519"
-       "golang_org/x/crypto/hkdf"
        "hash"
+       "internal/x/crypto/cryptobyte"
+       "internal/x/crypto/curve25519"
+       "internal/x/crypto/hkdf"
        "io"
        "math/big"
 )
index 7f804ee5715a2d27c1113fcdb13d61d0c7a51db8..9560176259e21929c4866315ea19d671c99dfff4 100644 (file)
@@ -12,7 +12,7 @@ import (
        "crypto/sha256"
        "crypto/subtle"
        "errors"
-       "golang_org/x/crypto/cryptobyte"
+       "internal/x/crypto/cryptobyte"
        "io"
 )
 
index b0d366c2458b6e2104362970a139f6350ecd3998..d8587aba927d96068bd7ab68ce2ca5af30f34b67 100644 (file)
@@ -24,8 +24,8 @@ import (
        "encoding/pem"
        "errors"
        "fmt"
-       "golang_org/x/crypto/cryptobyte"
-       cryptobyte_asn1 "golang_org/x/crypto/cryptobyte/asn1"
+       "internal/x/crypto/cryptobyte"
+       cryptobyte_asn1 "internal/x/crypto/cryptobyte/asn1"
        "io"
        "math/big"
        "net"
index 091443f646f2fdfc1fbce5dbf51136b16676413a..db8b12eabf83c32952adc1cef8980f2b7241f2d7 100644 (file)
@@ -351,12 +351,16 @@ func TestImportDirNotExist(t *testing.T) {
 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)
+       wd, err := os.Getwd()
+       if err != nil {
+               t.Fatal(err)
+       }
+       ctxt.GOPATH = filepath.Join(wd, "testdata/withvendor")
+       p, err := ctxt.Import("c/d", filepath.Join(ctxt.GOPATH, "src/a/b"), 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 c/d from testdata src/a/b directory: %v", err)
        }
-       want := "vendor/golang_org/x/net/http2/hpack"
+       want := "a/vendor/c/d"
        if p.ImportPath != want {
                t.Fatalf("Import succeeded but found %q, want %q", p.ImportPath, want)
        }
@@ -365,8 +369,12 @@ func TestImportVendor(t *testing.T) {
 func TestImportVendorFailure(t *testing.T) {
        testenv.MustHaveGoBuild(t) // really must just have source
        ctxt := Default
-       ctxt.GOPATH = ""
-       p, err := ctxt.Import("x.com/y/z", filepath.Join(ctxt.GOROOT, "src/net/http"), 0)
+       wd, err := os.Getwd()
+       if err != nil {
+               t.Fatal(err)
+       }
+       ctxt.GOPATH = filepath.Join(wd, "testdata/withvendor")
+       p, err := ctxt.Import("x.com/y/z", filepath.Join(ctxt.GOPATH, "src/a/b"), 0)
        if err == nil {
                t.Fatalf("found made-up package x.com/y/z in %s", p.Dir)
        }
@@ -380,9 +388,13 @@ func TestImportVendorFailure(t *testing.T) {
 func TestImportVendorParentFailure(t *testing.T) {
        testenv.MustHaveGoBuild(t) // really must just have source
        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)
+       wd, err := os.Getwd()
+       if err != nil {
+               t.Fatal(err)
+       }
+       ctxt.GOPATH = filepath.Join(wd, "testdata/withvendor")
+       // This import should fail because the vendor/c directory has no source code.
+       p, err := ctxt.Import("c", filepath.Join(ctxt.GOPATH, "src/a/b"), 0)
        if err == nil {
                t.Fatalf("found empty parent in %s", p.Dir)
        }
index 4654a8d9ed6f99d62a8089ac0925b62fe706681b..7251274756407b9e1db279e26f73f1d8b6077f18 100644 (file)
@@ -320,7 +320,7 @@ var pkgDeps = map[string][]string{
                "context", "math/rand", "os", "reflect", "sort", "syscall", "time",
                "internal/nettrace", "internal/poll", "internal/syscall/unix",
                "internal/syscall/windows", "internal/singleflight", "internal/race",
-               "golang_org/x/net/dns/dnsmessage", "golang_org/x/net/lif", "golang_org/x/net/route",
+               "internal/x/net/dns/dnsmessage", "internal/x/net/lif", "internal/x/net/route",
        },
 
        // NET enables use of basic network-related packages.
@@ -357,9 +357,9 @@ var pkgDeps = map[string][]string{
                "crypto/sha1",
                "crypto/sha256",
                "crypto/sha512",
-               "golang_org/x/crypto/chacha20poly1305",
-               "golang_org/x/crypto/curve25519",
-               "golang_org/x/crypto/poly1305",
+               "internal/x/crypto/chacha20poly1305",
+               "internal/x/crypto/curve25519",
+               "internal/x/crypto/poly1305",
        },
 
        // Random byte, number generation.
@@ -387,13 +387,13 @@ var pkgDeps = map[string][]string{
 
        // SSL/TLS.
        "crypto/tls": {
-               "L4", "CRYPTO-MATH", "OS", "golang_org/x/crypto/cryptobyte", "golang_org/x/crypto/hkdf",
+               "L4", "CRYPTO-MATH", "OS", "internal/x/crypto/cryptobyte", "internal/x/crypto/hkdf",
                "container/list", "crypto/x509", "encoding/pem", "net", "syscall",
        },
        "crypto/x509": {
                "L4", "CRYPTO-MATH", "OS", "CGO",
                "crypto/x509/pkix", "encoding/pem", "encoding/hex", "net", "os/user", "syscall", "net/url",
-               "golang_org/x/crypto/cryptobyte", "golang_org/x/crypto/cryptobyte/asn1",
+               "internal/x/crypto/cryptobyte", "internal/x/crypto/cryptobyte/asn1",
        },
        "crypto/x509/pkix": {"L4", "CRYPTO-MATH", "encoding/hex"},
 
@@ -409,12 +409,12 @@ var pkgDeps = map[string][]string{
                "context",
                "crypto/rand",
                "crypto/tls",
-               "golang_org/x/net/http/httpguts",
-               "golang_org/x/net/http/httpproxy",
-               "golang_org/x/net/http2/hpack",
-               "golang_org/x/net/idna",
-               "golang_org/x/text/unicode/norm",
-               "golang_org/x/text/width",
+               "internal/x/net/http/httpguts",
+               "internal/x/net/http/httpproxy",
+               "internal/x/net/http2/hpack",
+               "internal/x/net/idna",
+               "internal/x/text/unicode/norm",
+               "internal/x/text/width",
                "internal/nettrace",
                "mime/multipart",
                "net/http/httptrace",
@@ -432,9 +432,9 @@ var pkgDeps = map[string][]string{
        "net/http/fcgi":      {"L4", "NET", "OS", "context", "net/http", "net/http/cgi"},
        "net/http/httptest": {
                "L4", "NET", "OS", "crypto/tls", "flag", "net/http", "net/http/internal", "crypto/x509",
-               "golang_org/x/net/http/httpguts",
+               "internal/x/net/http/httpguts",
        },
-       "net/http/httputil": {"L4", "NET", "OS", "context", "net/http", "net/http/internal", "golang_org/x/net/http/httpguts"},
+       "net/http/httputil": {"L4", "NET", "OS", "context", "net/http", "net/http/internal", "internal/x/net/http/httpguts"},
        "net/http/pprof":    {"L4", "OS", "html/template", "net/http", "runtime/pprof", "runtime/trace"},
        "net/rpc":           {"L4", "NET", "encoding/gob", "html/template", "net/http"},
        "net/rpc/jsonrpc":   {"L4", "NET", "encoding/json", "net/rpc"},
@@ -485,7 +485,7 @@ func listStdPkgs(goroot string) ([]string, error) {
                }
 
                name := filepath.ToSlash(path[len(src):])
-               if name == "builtin" || name == "cmd" || strings.Contains(name, "golang_org") {
+               if name == "builtin" || name == "cmd" || strings.Contains(name, "internal/x/") {
                        return filepath.SkipDir
                }
 
diff --git a/src/go/build/testdata/withvendor/src/a/b/b.go b/src/go/build/testdata/withvendor/src/a/b/b.go
new file mode 100644 (file)
index 0000000..4405d54
--- /dev/null
@@ -0,0 +1,3 @@
+package b
+
+import _ "c/d"
diff --git a/src/go/build/testdata/withvendor/src/a/vendor/c/d/d.go b/src/go/build/testdata/withvendor/src/a/vendor/c/d/d.go
new file mode 100644 (file)
index 0000000..142fb42
--- /dev/null
@@ -0,0 +1 @@
+package d
index b9caa90fc5888f3e342cadacb4e64378bc1697f2..b84672610c6f8be8875062192fcb11b8d64c505e 100644 (file)
@@ -99,7 +99,7 @@ var importedObjectTests = []struct {
        {"math.Pi", "const Pi untyped float"},
        {"math.Sin", "func Sin(x float64) float64"},
        {"math/big.Int", "type Int struct{neg bool; abs nat}"},
-       {"golang_org/x/text/unicode/norm.MaxSegmentSize", "const MaxSegmentSize untyped int"},
+       {"internal/x/text/unicode/norm.MaxSegmentSize", "const MaxSegmentSize untyped int"},
 }
 
 func TestImportedTypes(t *testing.T) {
similarity index 97%
rename from src/vendor/golang_org/x/crypto/chacha20poly1305/chacha20poly1305.go
rename to src/internal/x/crypto/chacha20poly1305/chacha20poly1305.go
index e28f49d12fcbecef1794d64b5dca282d11a704b2..80789a12122932914608fa458c798af91a3c0dab 100644 (file)
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // Package chacha20poly1305 implements the ChaCha20-Poly1305 AEAD as specified in RFC 7539.
-package chacha20poly1305 // import "golang.org/x/crypto/chacha20poly1305"
+package chacha20poly1305
 
 import (
        "crypto/cipher"
similarity index 96%
rename from src/vendor/golang_org/x/crypto/chacha20poly1305/chacha20poly1305_generic.go
rename to src/internal/x/crypto/chacha20poly1305/chacha20poly1305_generic.go
index 56e4f0e782a747cf9c34fcd8db5215bdb9514a31..a77ab35f676d27a7d3611761f3cb91fb285dbc1c 100644 (file)
@@ -7,8 +7,8 @@ package chacha20poly1305
 import (
        "encoding/binary"
 
-       "golang_org/x/crypto/internal/chacha20"
-       "golang_org/x/crypto/poly1305"
+       "internal/x/crypto/internal/chacha20"
+       "internal/x/crypto/poly1305"
 )
 
 func roundTo16(n int) int {
similarity index 99%
rename from src/vendor/golang_org/x/crypto/cryptobyte/asn1.go
rename to src/internal/x/crypto/cryptobyte/asn1.go
index 08314b47d1c56cb6956dd8a1fc478b893933a745..2d40680ddd3b7f0e3f0885275fb4afee898dbfab 100644 (file)
@@ -11,7 +11,7 @@ import (
        "reflect"
        "time"
 
-       "golang_org/x/crypto/cryptobyte/asn1"
+       "internal/x/crypto/cryptobyte/asn1"
 )
 
 // This file contains ASN.1-related methods for String and Builder.
similarity index 96%
rename from src/vendor/golang_org/x/crypto/cryptobyte/asn1/asn1.go
rename to src/internal/x/crypto/cryptobyte/asn1/asn1.go
index cda8e3edfd5ea4322c93d3b92c06ab771b82bef4..90ef6a241de2f5b95521975032b35450eb187ca7 100644 (file)
@@ -4,7 +4,7 @@
 
 // Package asn1 contains supporting types for parsing and building ASN.1
 // messages with the cryptobyte package.
-package asn1 // import "golang.org/x/crypto/cryptobyte/asn1"
+package asn1
 
 // Tag represents an ASN.1 identifier octet, consisting of a tag number
 // (indicating a type) and class (such as context-specific or constructed).
similarity index 99%
rename from src/vendor/golang_org/x/crypto/cryptobyte/asn1_test.go
rename to src/internal/x/crypto/cryptobyte/asn1_test.go
index f7762880ca84b8338abc50a2dccf3518ec03c1a2..ca28e3bcfb2565b3c67461265964fe809e88853e 100644 (file)
@@ -12,7 +12,7 @@ import (
        "testing"
        "time"
 
-       "golang_org/x/crypto/cryptobyte/asn1"
+       "internal/x/crypto/cryptobyte/asn1"
 )
 
 type readASN1Test struct {
similarity index 98%
rename from src/vendor/golang_org/x/crypto/cryptobyte/example_test.go
rename to src/internal/x/crypto/cryptobyte/example_test.go
index 056c23014a14f30ff53e6dab573c5da5c786c4c0..5b50025318f5bb3ffe9eba2c02981fbe82fe6d75 100644 (file)
@@ -8,8 +8,8 @@ import (
        "errors"
        "fmt"
 
-       "golang_org/x/crypto/cryptobyte"
-       "golang_org/x/crypto/cryptobyte/asn1"
+       "internal/x/crypto/cryptobyte"
+       "internal/x/crypto/cryptobyte/asn1"
 )
 
 func ExampleString_lengthPrefixed() {
similarity index 98%
rename from src/vendor/golang_org/x/crypto/cryptobyte/string.go
rename to src/internal/x/crypto/cryptobyte/string.go
index 39bf98aeead8160094c007d8edb4066b5720283c..bd2ed2e207c6e0c9f898063ba5351aa2ae2c26f4 100644 (file)
@@ -15,7 +15,7 @@
 //
 // See the documentation and examples for the Builder and String types to get
 // started.
-package cryptobyte // import "golang.org/x/crypto/cryptobyte"
+package cryptobyte
 
 // String represents a string of bytes. It provides methods for parsing
 // fixed-length and length-prefixed values from it.
similarity index 94%
rename from src/vendor/golang_org/x/crypto/curve25519/doc.go
rename to src/internal/x/crypto/curve25519/doc.go
index da9b10d9c1ffd204d7d4ccd683b196c6b5fb5e67..076a8d4f10aa3bed478fdb29a2ae2b098531c77d 100644 (file)
@@ -4,7 +4,7 @@
 
 // Package curve25519 provides an implementation of scalar multiplication on
 // the elliptic curve known as curve25519. See https://cr.yp.to/ecdh.html
-package curve25519 // import "golang.org/x/crypto/curve25519"
+package curve25519
 
 // basePoint is the x coordinate of the generator of the curve.
 var basePoint = [32]byte{9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
similarity index 97%
rename from src/vendor/golang_org/x/crypto/hkdf/example_test.go
rename to src/internal/x/crypto/hkdf/example_test.go
index 1fd140a324dc7aafdbee304e10a7f5c053777eca..3b68a408103b97f89d6041dcbf14f39c3d3ab7f7 100644 (file)
@@ -11,7 +11,7 @@ import (
        "fmt"
        "io"
 
-       "golang_org/x/crypto/hkdf"
+       "internal/x/crypto/hkdf"
 )
 
 // Usage example that expands one master secret into three other
similarity index 98%
rename from src/vendor/golang_org/x/crypto/hkdf/hkdf.go
rename to src/internal/x/crypto/hkdf/hkdf.go
index dda3f143bec506c81852b3f9e19dd7ffbf4c92cf..c9077658e64b785f3110d27284c520a2ec4caaae 100644 (file)
@@ -8,7 +8,7 @@
 // HKDF is a cryptographic key derivation function (KDF) with the goal of
 // expanding limited input keying material into one or more cryptographically
 // strong secret keys.
-package hkdf // import "golang.org/x/crypto/hkdf"
+package hkdf
 
 import (
        "crypto/hmac"
similarity index 95%
rename from src/vendor/golang_org/x/crypto/poly1305/poly1305.go
rename to src/internal/x/crypto/poly1305/poly1305.go
index f562fa5712ba09a1bed13121c08a98b502ab328f..6d6be9a6406a2e6dbeaf38f7fa771c7298f6dfab 100644 (file)
@@ -17,7 +17,7 @@ used with a fixed key in order to generate one-time keys from an nonce.
 However, in this package AES isn't used and the one-time key is specified
 directly.
 */
-package poly1305 // import "golang.org/x/crypto/poly1305"
+package poly1305
 
 import "crypto/subtle"
 
diff --git a/src/internal/x/fiximports.bash b/src/internal/x/fiximports.bash
new file mode 100755 (executable)
index 0000000..ec72643
--- /dev/null
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# To fix import paths when importing new snapshots from the golang.org/x
+# repositories, run this script in the current directory.
+
+sed -i 's,"golang\.org/x,"internal/x,g' $(grep -lr 'golang.org')
similarity index 98%
rename from src/vendor/golang_org/x/net/dns/dnsmessage/example_test.go
rename to src/internal/x/net/dns/dnsmessage/example_test.go
index a1bb5b7b1b88e6bd9a1ed073f233a3e02f139255..8453c230483cb45120391464aec9cf5ce92c0e5b 100644 (file)
@@ -9,7 +9,7 @@ import (
        "net"
        "strings"
 
-       "golang_org/x/net/dns/dnsmessage"
+       "internal/x/net/dns/dnsmessage"
 )
 
 func mustNewName(name string) dnsmessage.Name {
similarity index 99%
rename from src/vendor/golang_org/x/net/http/httpguts/httplex.go
rename to src/internal/x/net/http/httpguts/httplex.go
index 9337435174e677336726aa5f81160bd2ef4fb7fb..7f3cdd8bd255c100d73e7601f1a01834059a162c 100644 (file)
@@ -9,7 +9,7 @@ import (
        "strings"
        "unicode/utf8"
 
-       "golang_org/x/net/idna"
+       "internal/x/net/idna"
 )
 
 var isTokenTable = [127]bool{
similarity index 99%
rename from src/vendor/golang_org/x/net/http/httpproxy/proxy.go
rename to src/internal/x/net/http/httpproxy/proxy.go
index 0409f4340c373a6594341f50e83d03b767c2644d..d3947841392e6cc06c1ccc089312fb2f0b10719e 100644 (file)
@@ -19,7 +19,7 @@ import (
        "strings"
        "unicode/utf8"
 
-       "golang_org/x/net/idna"
+       "internal/x/net/idna"
 )
 
 // Config holds configuration for HTTP proxy settings. See
similarity index 99%
rename from src/vendor/golang_org/x/net/http/httpproxy/proxy_test.go
rename to src/internal/x/net/http/httpproxy/proxy_test.go
index 8791f64bcdc2ce5462b914796e91ea9fdde608b6..cf0589dba97eca4d1e04d0a069d7d51b2bbc8320 100644 (file)
@@ -13,7 +13,7 @@ import (
        "strings"
        "testing"
 
-       "golang_org/x/net/http/httpproxy"
+       "internal/x/net/http/httpproxy"
 )
 
 // setHelper calls t.Helper() for Go 1.9+ (see go19_test.go) and does nothing otherwise.
similarity index 99%
rename from src/vendor/golang_org/x/net/idna/idna.go
rename to src/internal/x/net/idna/idna.go
index 9fd0334cd9df0b7c14798f1c07382a2a151d1ae3..7f2471e70e7aad0d2f21e3dad6fa6da1d035260c 100644 (file)
 // UTS #46 is defined in http://www.unicode.org/reports/tr46.
 // See http://unicode.org/cldr/utility/idna.jsp for a visualization of the
 // differences between these two standards.
-package idna // import "golang_org/x/text/internal/export/idna"
+package idna
 
 import (
        "fmt"
        "strings"
        "unicode/utf8"
 
-       "golang_org/x/text/secure/bidirule"
-       "golang_org/x/text/unicode/bidi"
-       "golang_org/x/text/unicode/norm"
+       "internal/x/text/secure/bidirule"
+       "internal/x/text/unicode/bidi"
+       "internal/x/text/unicode/norm"
 )
 
 // NOTE: Unlike common practice in Go APIs, the functions will return a
similarity index 99%
rename from src/vendor/golang_org/x/net/idna/tables.go
rename to src/internal/x/net/idna/tables.go
index a470c5a3e2588d9416a352c52ed04237543e915e..41cf9c13d2a5b3b2869fff6ee4e9be2319036833 100644 (file)
@@ -1,6 +1,6 @@
 // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
 
-// Code generated by running "go generate" in golang_org/x/text. DO NOT EDIT.
+// Code generated by running "go generate" in internal/x/text. DO NOT EDIT.
 
 package idna
 
similarity index 97%
rename from src/vendor/golang_org/x/net/idna/trieval.go
rename to src/internal/x/net/idna/trieval.go
index 5f4e5f2e7457e323aaedd8508709755d149ebd81..bf57260034946e6f2dbd1796e3ec48f8d624f283 100644 (file)
@@ -1,6 +1,6 @@
 // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
 
-// Code generated by running "go generate" in golang_org/x/text. DO NOT EDIT.
+// Code generated by running "go generate" in internal/x/text. DO NOT EDIT.
 
 package idna
 
similarity index 98%
rename from src/vendor/golang_org/x/net/internal/nettest/stack.go
rename to src/internal/x/net/internal/nettest/stack.go
index 3b8a01e9bb0edd57602b8c5618b73f9e0776c9a4..1a545e21ab0198f434e7f9b8862af76d4ea2d9d4 100644 (file)
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // Package nettest provides utilities for network testing.
-package nettest // import "golang.org/x/net/internal/nettest"
+package nettest
 
 import (
        "fmt"
similarity index 97%
rename from src/vendor/golang_org/x/net/nettest/conntest_test.go
rename to src/internal/x/net/nettest/conntest_test.go
index ae8426a05c29a642bb330d045fe0e37b31ea13f9..e14df0e6fbb77d17dfc20b28a925109b320c6b03 100644 (file)
@@ -12,7 +12,7 @@ import (
        "runtime"
        "testing"
 
-       "golang_org/x/net/internal/nettest"
+       "internal/x/net/internal/nettest"
 )
 
 func TestTestConn(t *testing.T) {
similarity index 99%
rename from src/vendor/golang_org/x/text/secure/bidirule/bidirule.go
rename to src/internal/x/text/secure/bidirule/bidirule.go
index c3ca2bc6fede0e5904a7fbc1bd46244cd6dcdca5..87e656a37d0122b0d30f456b1b3af98a2663efeb 100644 (file)
@@ -14,8 +14,8 @@ import (
        "errors"
        "unicode/utf8"
 
-       "golang_org/x/text/transform"
-       "golang_org/x/text/unicode/bidi"
+       "internal/x/text/transform"
+       "internal/x/text/unicode/bidi"
 )
 
 // This file contains an implementation of RFC 5893: Right-to-Left Scripts for
similarity index 85%
rename from src/vendor/golang_org/x/text/secure/doc.go
rename to src/internal/x/text/secure/doc.go
index 5eb60b94bf275278ca8566e450529ad9a5479a88..6151b79d6e3e3b074d85bcef85adfffb4e9cd621 100644 (file)
@@ -5,4 +5,4 @@
 // license that can be found in the LICENSE file.
 
 // secure is a repository of text security related packages.
-package secure // import "golang_org/x/text/secure"
+package secure
similarity index 92%
rename from src/vendor/golang_org/x/text/transform/examples_test.go
rename to src/internal/x/text/transform/examples_test.go
index 1323d9bec033dc514d076a9440c7fcc570507eb4..8d2fbb21711e7257b38a354f13342a2ccfd78c96 100644 (file)
@@ -10,8 +10,8 @@ import (
        "fmt"
        "unicode"
 
-       "golang_org/x/text/transform"
-       "golang_org/x/text/unicode/norm"
+       "internal/x/text/transform"
+       "internal/x/text/unicode/norm"
 )
 
 func ExampleRemoveFunc() {
similarity index 99%
rename from src/vendor/golang_org/x/text/transform/transform.go
rename to src/internal/x/text/transform/transform.go
index 9ddfa80cf3e69f0c7d939c3064a79b7c871e1b1f..7b6b55e0194f21b8f9efe5129901ca08dbfbaf85 100644 (file)
@@ -8,7 +8,7 @@
 // bytes passing through as well as various transformations. Example
 // transformations provided by other packages include normalization and
 // conversion between character sets.
-package transform // import "golang_org/x/text/transform"
+package transform
 
 import (
        "bytes"
similarity index 99%
rename from src/vendor/golang_org/x/text/unicode/bidi/bidi.go
rename to src/internal/x/text/unicode/bidi/bidi.go
index e691ae86942b1829db352e0e884a298467d0613f..4542171736ee152d617751b7ae100a1eddacb23f 100644 (file)
@@ -10,7 +10,7 @@
 //
 // NOTE: UNDER CONSTRUCTION. This API may change in backwards incompatible ways
 // and without notice.
-package bidi // import "golang_org/x/text/unicode/bidi"
+package bidi
 
 // TODO:
 // The following functionality would not be hard to implement, but hinges on
similarity index 99%
rename from src/vendor/golang_org/x/text/unicode/bidi/example_test.go
rename to src/internal/x/text/unicode/bidi/example_test.go
index e1739598d43e19bbf51b9e9e121fc786c85c252b..56c5c4a1219ab32a640bc1849dd62b33c7128ad9 100644 (file)
@@ -8,7 +8,7 @@ import (
        "fmt"
        "log"
 
-       "golang_org/x/text/bidi"
+       "internal/x/text/bidi"
 )
 
 func foo() {
similarity index 99%
rename from src/vendor/golang_org/x/text/unicode/bidi/tables.go
rename to src/internal/x/text/unicode/bidi/tables.go
index fb2229efa875c6e98fc2e0c1fefc6438b4a46e15..c9c45c625f5599eae530dec6715af929d9f0a4b4 100644 (file)
@@ -1,6 +1,6 @@
 // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
 
-// Code generated by running "go generate" in golang_org/x/text. DO NOT EDIT.
+// Code generated by running "go generate" in internal/x/text. DO NOT EDIT.
 
 package bidi
 
similarity index 95%
rename from src/vendor/golang_org/x/text/unicode/bidi/trieval.go
rename to src/internal/x/text/unicode/bidi/trieval.go
index c3f0e21f3e8791311a5a44d2a2d8a12bc5371584..e59d249c7507fd75c8945f891c2f8bcd67acf294 100644 (file)
@@ -1,6 +1,6 @@
 // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
 
-// Code generated by running "go generate" in golang_org/x/text. DO NOT EDIT.
+// Code generated by running "go generate" in internal/x/text. DO NOT EDIT.
 
 package bidi
 
similarity index 84%
rename from src/vendor/golang_org/x/text/unicode/doc.go
rename to src/internal/x/text/unicode/doc.go
index 55a6775d59a38b29a4bb66f876e2e4e3306c2ed4..4f7e9f5a4336edf8dc1759edbfbd199e017b2036 100644 (file)
@@ -5,6 +5,6 @@
 // license that can be found in the LICENSE file.
 
 // unicode holds packages with implementations of Unicode standards that are
-// mostly used as building blocks for other packages in golang_org/x/text,
+// mostly used as building blocks for other packages in internal/x/text,
 // layout engines, or are otherwise more low-level in nature.
 package unicode
similarity index 98%
rename from src/vendor/golang_org/x/text/unicode/norm/example_iter_test.go
rename to src/internal/x/text/unicode/norm/example_iter_test.go
index aed6c16fbb23d5539aec27620b9e28313b54a312..fb0e52410b8a32514819e6de4644bda6e54618bb 100644 (file)
@@ -11,7 +11,7 @@ import (
        "fmt"
        "unicode/utf8"
 
-       "golang_org/x/text/unicode/norm"
+       "internal/x/text/unicode/norm"
 )
 
 // EqualSimple uses a norm.Iter to compare two non-normalized
similarity index 94%
rename from src/vendor/golang_org/x/text/unicode/norm/example_test.go
rename to src/internal/x/text/unicode/norm/example_test.go
index 72e72c9d34a57ce3d091a857565811c30b1bea93..a9904400df43d5b9e231cb1b61c48a2b5388622e 100644 (file)
@@ -9,7 +9,7 @@ package norm_test
 import (
        "fmt"
 
-       "golang_org/x/text/unicode/norm"
+       "internal/x/text/unicode/norm"
 )
 
 func ExampleForm_NextBoundary() {
similarity index 99%
rename from src/vendor/golang_org/x/text/unicode/norm/normalize.go
rename to src/internal/x/text/unicode/norm/normalize.go
index 4de4ed6ed0f9dd79a7d4e2bdcc182788dc66ca76..791c39b1c48e8f575bf2bcfded425d854c33f1ca 100644 (file)
@@ -7,12 +7,12 @@
 // Note: the file data_test.go that is generated should not be checked in.
 
 // Package norm contains types and functions for normalizing Unicode strings.
-package norm // import "golang_org/x/text/unicode/norm"
+package norm
 
 import (
        "unicode/utf8"
 
-       "golang_org/x/text/transform"
+       "internal/x/text/transform"
 )
 
 // A Form denotes a canonical representation of Unicode code points.
similarity index 99%
rename from src/vendor/golang_org/x/text/unicode/norm/tables.go
rename to src/internal/x/text/unicode/norm/tables.go
index d6466836cefe62e51b367484ef404c2d8752c3c4..2dd61adf63c032b3b0b1f43868ef2dd2c41f2c7d 100644 (file)
@@ -1,6 +1,6 @@
 // Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
 
-// Code generated by running "go generate" in golang_org/x/text. DO NOT EDIT.
+// Code generated by running "go generate" in internal/x/text. DO NOT EDIT.
 
 package norm
 
similarity index 98%
rename from src/vendor/golang_org/x/text/unicode/norm/transform.go
rename to src/internal/x/text/unicode/norm/transform.go
index 73869a5a1cddb1f75a1dcc96bc15b803bd902596..7837cb96a414a4cb17480e7fc17c0da0ab17a0b0 100644 (file)
@@ -9,7 +9,7 @@ package norm
 import (
        "unicode/utf8"
 
-       "golang_org/x/text/transform"
+       "internal/x/text/transform"
 )
 
 // Reset implements the Reset method of the transform.Transformer interface.
index 2c47bc413013f87a05b1a47209f448fb0bbaf13c..4fdf60ff4e35a183c4d3ea3828339bd8cf971cc3 100644 (file)
@@ -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
index 73630faa498c6c049e5d1bab014b1f916907a815..86ce92dc437844d6c98e627fb948ebb94b2e1b8b 100644 (file)
@@ -23,7 +23,7 @@ import (
        "sync"
        "time"
 
-       "golang_org/x/net/dns/dnsmessage"
+       "internal/x/net/dns/dnsmessage"
 )
 
 var (
index 7dccb6b8ec5d8af4be000150f9a70c541009bd24..be04a44c14beaf9c28e7d1d75dfa024bda05a8cb 100644 (file)
@@ -20,7 +20,7 @@ import (
        "testing"
        "time"
 
-       "golang_org/x/net/dns/dnsmessage"
+       "internal/x/net/dns/dnsmessage"
 )
 
 var goResolver = Resolver{PreferGo: true}
index 12cf65f109c13c70fca4f88c7736d4fef30828ff..1a97b01db8d946aca089487d4e9cd4e22c364002 100644 (file)
@@ -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
index 30d1a52b63190a3b402ea5a3bccde4062166dd5c..624b2cfe6956751bce1e81a7519cdcf510548a77 100644 (file)
@@ -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
index 67f90b837698a95e13d7b36cda71247b4abdd052..f2c3c0757bacf4f3bb99a91e54fd81faa5a5eb2e 100644 (file)
@@ -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
index e9552a225641410a442d753487ce919d7d7fcc52..f0607a68ea2d3f269fc49c8fd7a3b1ededb0ec4b 100644 (file)
@@ -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
index d994e81d237713f3a9e4ac7a91b465f4fa91f69f..fb058f9fbf38ff27e6f36802149573303b41317a 100644 (file)
@@ -26,7 +26,7 @@ import (
        "strings"
        "sync"
 
-       "golang_org/x/net/idna"
+       "internal/x/net/idna"
 )
 
 const (
index b3ca56c4190dbe744d2fee7a15c612fc256ba651..f906ce829b4aaffb4c2cfdb936674f308b5f4fad 100644 (file)
@@ -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"
index cf03b09f844145c444c5ea9a684101924272e024..97ed59e9fd1e8b7ad234c8393acb68980cfe04db 100644 (file)
@@ -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.
index 3eb9f0da91298357531b270e5170c980d1ecf62d..e8a93e9137eb8a97d3840d018296462a3dee6d54 100644 (file)
@@ -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
index ad0201d554b75763cdaadf19bae7cb0df1d183e2..f30ad2151c4944bf14e33a987462c64a57204bbf 100644 (file)
@@ -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
index 1021ce5aa20a349d40dbde4b4a56a2de9a8d8e95..6e075847ddeeadd2802c46b29e182637be4ed4df 100644 (file)
@@ -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
index 35b1c2681592ae88a18f09a67e3a4ed3afb54f91..77372964b104ca5342efd99afcdcaa5a14f75673 100644 (file)
@@ -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
index 0b84ca37d4a44787c94f1067e8fb9dd05a994f0c..818fafe9708a52251d145336e0cf82013c862731 100644 (file)
@@ -9,7 +9,7 @@ package net
 import (
        "syscall"
 
-       "golang_org/x/net/route"
+       "internal/x/net/route"
 )
 
 func interfaceMessages(ifindex int) ([]route.Message, error) {
index 2ec8e1cc6ef70f10d3ff92d6218c3f4e0731ca09..6a6b3a58187dc1d1386403e3e92afa9e78ced17f 100644 (file)
@@ -7,7 +7,7 @@ package net
 import (
        "syscall"
 
-       "golang_org/x/net/route"
+       "internal/x/net/route"
 )
 
 func interfaceMessages(ifindex int) ([]route.Message, error) {
index 8a7d6f67c039d4480fdbbefb4e17c9cb13912464..8eee2aa03159a9c6f3b8841f42181c5c7330d696 100644 (file)
@@ -7,7 +7,7 @@ package net
 import (
        "syscall"
 
-       "golang_org/x/net/route"
+       "internal/x/net/route"
 )
 
 func interfaceMessages(ifindex int) ([]route.Message, error) {
index dc8ffbfcb8a6430d78edcb1371609805bc007a0f..868d4174ed38d99bb2ed82116397cff3ccc98cdd 100644 (file)
@@ -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
index bef9dcfe14634b43aeb6d76e98e7fa6bfe299dfb..6543f121a738f2ca096bbcfcab624f12aa0ce764 100644 (file)
@@ -12,7 +12,7 @@ import (
        "sync"
        "syscall"
 
-       "golang_org/x/net/dns/dnsmessage"
+       "internal/x/net/dns/dnsmessage"
 )
 
 var onceReadProtocols sync.Once
index 84a71b756bc044eefcd48c6e130fc9bf9e34b342..53ddc16313d97446e1ccfebc19589a6da8ef3f46 100644 (file)
@@ -10,7 +10,7 @@ import (
        "testing"
        "time"
 
-       "golang_org/x/net/nettest"
+       "internal/x/net/nettest"
 )
 
 func TestPipe(t *testing.T) {