all: move internal/x to vendor/golang.org/x and revendor using 'go mod vendor'

This also updates the vendored-in versions of several packages: 'go
mod vendor' selects a consistent version of each module, but we had
previously vendored an ad-hoc selection of packages.

Notably, x/crypto/hkdf was previously vendored in at a much newer
commit than the rest of x/crypto. Bringing the rest of x/crypto up to
that commit introduced an import of golang.org/x/sys/cpu, which broke
the js/wasm build, requiring an upgrade of x/sys to pick up CL 165749.

Updates #30228
Updates #30241
Updates #25822

Change-Id: I5b3dbc232b7e6a048a158cbd8d36137af1efb711
Reviewed-on: https://go-review.googlesource.com/c/go/+/164623
Reviewed-by: Filippo Valsorda <filippo@golang.org>

10 files changed, 13 insertions, 13 deletions

diff --git a/src/net/http/h2_bundle.go b/src/net/http/h2_bundle.go
index f714cbb9a1..262beb7068 100644
--- a/src/net/http/h2_bundle.go
+++ b/src/net/http/h2_bundle.go
@@ -44,9 +44,9 @@ import (
 	"sync"
 	"time"
 
-	"internal/x/net/http/httpguts"
-	"internal/x/net/http2/hpack"
-	"internal/x/net/idna"
+	"golang.org/x/net/http/httpguts"
+	"golang.org/x/net/http2/hpack"
+	"golang.org/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 e5d59e1412..1c829ae87f 100644
--- a/src/net/http/http.go
+++ b/src/net/http/http.go
@@ -11,7 +11,7 @@ import (
 	"time"
 	"unicode/utf8"
 
-	"internal/x/net/http/httpguts"
+	"golang.org/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 f2c3c0757b..59c98adfe8 100644
--- a/src/net/http/httptest/recorder.go
+++ b/src/net/http/httptest/recorder.go
@@ -12,7 +12,7 @@ import (
 	"strconv"
 	"strings"
 
-	"internal/x/net/http/httpguts"
+	"golang.org/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 4e10bf3997..92d7f63af5 100644
--- a/src/net/http/httputil/reverseproxy.go
+++ b/src/net/http/httputil/reverseproxy.go
@@ -18,7 +18,7 @@ import (
 	"sync"
 	"time"
 
-	"internal/x/net/http/httpguts"
+	"golang.org/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 dcad2b6fab..24e941f038 100644
--- a/src/net/http/request.go
+++ b/src/net/http/request.go
@@ -26,7 +26,7 @@ import (
 	"strings"
 	"sync"
 
-	"internal/x/net/idna"
+	"golang.org/x/net/idna"
 )
 
 const (
diff --git a/src/net/http/response.go b/src/net/http/response.go
index f906ce829b..6d22c2892d 100644
--- a/src/net/http/response.go
+++ b/src/net/http/response.go
@@ -12,7 +12,7 @@ import (
 	"crypto/tls"
 	"errors"
 	"fmt"
-	"internal/x/net/http/httpguts"
+	"golang.org/x/net/http/httpguts"
 	"io"
 	"net/textproto"
 	"net/url"
diff --git a/src/net/http/server.go b/src/net/http/server.go
index a19934e469..4e9ea34491 100644
--- a/src/net/http/server.go
+++ b/src/net/http/server.go
@@ -29,7 +29,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"internal/x/net/http/httpguts"
+	"golang.org/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 7d73dc4fc0..43c800bca5 100644
--- a/src/net/http/transfer.go
+++ b/src/net/http/transfer.go
@@ -21,7 +21,7 @@ import (
 	"sync"
 	"time"
 
-	"internal/x/net/http/httpguts"
+	"golang.org/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 f0ae6ef0b9..de1fb96818 100644
--- a/src/net/http/transport.go
+++ b/src/net/http/transport.go
@@ -30,8 +30,8 @@ import (
 	"sync/atomic"
 	"time"
 
-	"internal/x/net/http/httpguts"
-	"internal/x/net/http/httpproxy"
+	"golang.org/x/net/http/httpguts"
+	"golang.org/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 74767f8499..82741e8537 100644
--- a/src/net/http/transport_test.go
+++ b/src/net/http/transport_test.go
@@ -42,7 +42,7 @@ import (
 	"testing"
 	"time"
 
-	"internal/x/net/http/httpguts"
+	"golang.org/x/net/http/httpguts"
 )
 
 // TODO: test 5 pipelined requests with responses: 1) OK, 2) OK, Connection: Close