vendor: move golang.org/x/net/http2/hpack back to vendor

Updates #14047 Change-Id: I7e314e2c7e3e8da18ab023729740fbc9ea3f661e Reviewed-on: https://go-review.googlesource.com/21063 Run-TryBot: Brad Fitzpatrick <[email protected]> TryBot-Result: Gobot Gobot <[email protected]> Reviewed-by: Robert Griesemer <[email protected]>
golang · Mar 24, 2016 · 0104a31 · 0104a31
1 parent afafab3
commit 0104a31
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 12 deletions.
diff --git a/src/go/build/build_test.go b/src/go/build/build_test.go
@@ -300,7 +300,6 @@ func TestShellSafety(t *testing.T) {
 }
 
 func TestImportVendor(t *testing.T) {
-	t.Skip("skipping; hpack has moved to internal for now; golang.org/issue/14047")
 	testenv.MustHaveGoBuild(t) // really must just have source
 	ctxt := Default
 	ctxt.GOPATH = ""

diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
@@ -358,7 +358,7 @@ var pkgDeps = map[string][]string{
 		"L4", "NET", "OS",
 		"compress/gzip", "crypto/tls", "mime/multipart", "runtime/debug",
 		"net/http/internal",
-		"internal/golang.org/x/net/http2/hpack",
+		"golang.org/x/net/http2/hpack",
 	},
 	"net/http/internal": {"L4"},
 

diff --git a/src/net/http/h2_bundle.go b/src/net/http/h2_bundle.go
diff --git a/src/vendor/README b/src/vendor/README
diff --git a/...al/golang.org/x/net/http2/hpack/encode.go → ...or/golang.org/x/net/http2/hpack/encode.go b/...al/golang.org/x/net/http2/hpack/encode.go → ...or/golang.org/x/net/http2/hpack/encode.go
diff --git a/...lang.org/x/net/http2/hpack/encode_test.go → ...lang.org/x/net/http2/hpack/encode_test.go b/...lang.org/x/net/http2/hpack/encode_test.go → ...lang.org/x/net/http2/hpack/encode_test.go
diff --git a/...nal/golang.org/x/net/http2/hpack/hpack.go → ...dor/golang.org/x/net/http2/hpack/hpack.go b/...nal/golang.org/x/net/http2/hpack/hpack.go → ...dor/golang.org/x/net/http2/hpack/hpack.go
diff --git a/...olang.org/x/net/http2/hpack/hpack_test.go → ...olang.org/x/net/http2/hpack/hpack_test.go b/...olang.org/x/net/http2/hpack/hpack_test.go → ...olang.org/x/net/http2/hpack/hpack_test.go
diff --git a/...l/golang.org/x/net/http2/hpack/huffman.go → ...r/golang.org/x/net/http2/hpack/huffman.go b/...l/golang.org/x/net/http2/hpack/huffman.go → ...r/golang.org/x/net/http2/hpack/huffman.go
diff --git a/...al/golang.org/x/net/http2/hpack/tables.go → ...or/golang.org/x/net/http2/hpack/tables.go b/...al/golang.org/x/net/http2/hpack/tables.go → ...or/golang.org/x/net/http2/hpack/tables.go