cmd/vendor: move cmd/internal/unvendor packages to cmd/vendor

Updates #14047 Change-Id: I4b150533393bfb90e840497095ac32bcca4f04c2 Reviewed-on: https://go-review.googlesource.com/23114 Run-TryBot: Brad Fitzpatrick <[email protected]> TryBot-Result: Gobot Gobot <[email protected]> Reviewed-by: Brad Fitzpatrick <[email protected]>
golang · May 14, 2016 · 094afe0 · 094afe0
1 parent 6181db5
commit 094afe0
Show file tree

Hide file tree

Showing 34 changed files with 14 additions and 14 deletions.
diff --git a/misc/nacl/testzip.proto b/misc/nacl/testzip.proto
@@ -27,23 +27,23 @@ go	src=..
 			internal
 				objfile
 					objfile.go
-				unvendor
-					golang.org
-							x
-								arch
-									arm
-										armasm
-											testdata
-													+
-									x86
-										x86asm
-											testdata
-													+
 			gofmt
 				gofmt.go
 				gofmt_test.go
 				testdata
 					+
+			vendor
+				golang.org
+					x
+						arch
+							arm
+								armasm
+									testdata
+										+
+							x86
+								x86asm
+									testdata
+										+
 		archive
 			tar
 				testdata

diff --git a/src/cmd/internal/objfile/disasm.go b/src/cmd/internal/objfile/disasm.go
@@ -15,8 +15,8 @@ import (
 	"strings"
 	"text/tabwriter"
 
-	"cmd/internal/unvendor/golang.org/x/arch/arm/armasm"
-	"cmd/internal/unvendor/golang.org/x/arch/x86/x86asm"
+	"golang.org/x/arch/arm/armasm"
+	"golang.org/x/arch/x86/x86asm"
 )
 
 // Disasm is a disassembler for a given File.

diff --git a/...dor/golang.org/x/arch/arm/armasm/Makefile → ...dor/golang.org/x/arch/arm/armasm/Makefile b/...dor/golang.org/x/arch/arm/armasm/Makefile → ...dor/golang.org/x/arch/arm/armasm/Makefile
diff --git a/...or/golang.org/x/arch/arm/armasm/decode.go → ...or/golang.org/x/arch/arm/armasm/decode.go b/...or/golang.org/x/arch/arm/armasm/decode.go → ...or/golang.org/x/arch/arm/armasm/decode.go
diff --git a/...lang.org/x/arch/arm/armasm/decode_test.go → ...lang.org/x/arch/arm/armasm/decode_test.go b/...lang.org/x/arch/arm/armasm/decode_test.go → ...lang.org/x/arch/arm/armasm/decode_test.go
diff --git a/.../golang.org/x/arch/arm/armasm/ext_test.go → .../golang.org/x/arch/arm/armasm/ext_test.go b/.../golang.org/x/arch/arm/armasm/ext_test.go → .../golang.org/x/arch/arm/armasm/ext_test.go
diff --git a/...endor/golang.org/x/arch/arm/armasm/gnu.go → ...endor/golang.org/x/arch/arm/armasm/gnu.go b/...endor/golang.org/x/arch/arm/armasm/gnu.go → ...endor/golang.org/x/arch/arm/armasm/gnu.go
diff --git a/...ndor/golang.org/x/arch/arm/armasm/inst.go → ...ndor/golang.org/x/arch/arm/armasm/inst.go b/...ndor/golang.org/x/arch/arm/armasm/inst.go → ...ndor/golang.org/x/arch/arm/armasm/inst.go
diff --git a/...ang.org/x/arch/arm/armasm/objdump_test.go → ...ang.org/x/arch/arm/armasm/objdump_test.go b/...ang.org/x/arch/arm/armasm/objdump_test.go → ...ang.org/x/arch/arm/armasm/objdump_test.go
diff --git a/....org/x/arch/arm/armasm/objdumpext_test.go → ....org/x/arch/arm/armasm/objdumpext_test.go b/....org/x/arch/arm/armasm/objdumpext_test.go → ....org/x/arch/arm/armasm/objdumpext_test.go
diff --git a/...or/golang.org/x/arch/arm/armasm/plan9x.go → ...or/golang.org/x/arch/arm/armasm/plan9x.go b/...or/golang.org/x/arch/arm/armasm/plan9x.go → ...or/golang.org/x/arch/arm/armasm/plan9x.go
diff --git a/...or/golang.org/x/arch/arm/armasm/tables.go → ...or/golang.org/x/arch/arm/armasm/tables.go b/...or/golang.org/x/arch/arm/armasm/tables.go → ...or/golang.org/x/arch/arm/armasm/tables.go
diff --git a/...g.org/x/arch/arm/armasm/testdata/Makefile → ...g.org/x/arch/arm/armasm/testdata/Makefile b/...g.org/x/arch/arm/armasm/testdata/Makefile → ...g.org/x/arch/arm/armasm/testdata/Makefile
diff --git a/...org/x/arch/arm/armasm/testdata/decode.txt → ...org/x/arch/arm/armasm/testdata/decode.txt b/...org/x/arch/arm/armasm/testdata/decode.txt → ...org/x/arch/arm/armasm/testdata/decode.txt
diff --git a/...dor/golang.org/x/arch/x86/x86asm/Makefile → ...dor/golang.org/x/arch/x86/x86asm/Makefile b/...dor/golang.org/x/arch/x86/x86asm/Makefile → ...dor/golang.org/x/arch/x86/x86asm/Makefile
diff --git a/...or/golang.org/x/arch/x86/x86asm/decode.go → ...or/golang.org/x/arch/x86/x86asm/decode.go b/...or/golang.org/x/arch/x86/x86asm/decode.go → ...or/golang.org/x/arch/x86/x86asm/decode.go
diff --git a/...lang.org/x/arch/x86/x86asm/decode_test.go → ...lang.org/x/arch/x86/x86asm/decode_test.go b/...lang.org/x/arch/x86/x86asm/decode_test.go → ...lang.org/x/arch/x86/x86asm/decode_test.go
diff --git a/.../golang.org/x/arch/x86/x86asm/ext_test.go → .../golang.org/x/arch/x86/x86asm/ext_test.go b/.../golang.org/x/arch/x86/x86asm/ext_test.go → .../golang.org/x/arch/x86/x86asm/ext_test.go
diff --git a/...endor/golang.org/x/arch/x86/x86asm/gnu.go → ...endor/golang.org/x/arch/x86/x86asm/gnu.go b/...endor/golang.org/x/arch/x86/x86asm/gnu.go → ...endor/golang.org/x/arch/x86/x86asm/gnu.go
diff --git a/...ndor/golang.org/x/arch/x86/x86asm/inst.go → ...ndor/golang.org/x/arch/x86/x86asm/inst.go b/...ndor/golang.org/x/arch/x86/x86asm/inst.go → ...ndor/golang.org/x/arch/x86/x86asm/inst.go
diff --git a/...golang.org/x/arch/x86/x86asm/inst_test.go → ...golang.org/x/arch/x86/x86asm/inst_test.go b/...golang.org/x/arch/x86/x86asm/inst_test.go → ...golang.org/x/arch/x86/x86asm/inst_test.go
diff --git a/...dor/golang.org/x/arch/x86/x86asm/intel.go → ...dor/golang.org/x/arch/x86/x86asm/intel.go b/...dor/golang.org/x/arch/x86/x86asm/intel.go → ...dor/golang.org/x/arch/x86/x86asm/intel.go
diff --git a/...ang.org/x/arch/x86/x86asm/objdump_test.go → ...ang.org/x/arch/x86/x86asm/objdump_test.go b/...ang.org/x/arch/x86/x86asm/objdump_test.go → ...ang.org/x/arch/x86/x86asm/objdump_test.go
diff --git a/....org/x/arch/x86/x86asm/objdumpext_test.go → ....org/x/arch/x86/x86asm/objdumpext_test.go b/....org/x/arch/x86/x86asm/objdumpext_test.go → ....org/x/arch/x86/x86asm/objdumpext_test.go
diff --git a/...ng.org/x/arch/x86/x86asm/plan9ext_test.go → ...ng.org/x/arch/x86/x86asm/plan9ext_test.go b/...ng.org/x/arch/x86/x86asm/plan9ext_test.go → ...ng.org/x/arch/x86/x86asm/plan9ext_test.go
diff --git a/...or/golang.org/x/arch/x86/x86asm/plan9x.go → ...or/golang.org/x/arch/x86/x86asm/plan9x.go b/...or/golang.org/x/arch/x86/x86asm/plan9x.go → ...or/golang.org/x/arch/x86/x86asm/plan9x.go
diff --git a/...lang.org/x/arch/x86/x86asm/plan9x_test.go → ...lang.org/x/arch/x86/x86asm/plan9x_test.go b/...lang.org/x/arch/x86/x86asm/plan9x_test.go → ...lang.org/x/arch/x86/x86asm/plan9x_test.go
diff --git a/...or/golang.org/x/arch/x86/x86asm/tables.go → ...or/golang.org/x/arch/x86/x86asm/tables.go b/...or/golang.org/x/arch/x86/x86asm/tables.go → ...or/golang.org/x/arch/x86/x86asm/tables.go
diff --git a/...g.org/x/arch/x86/x86asm/testdata/Makefile → ...g.org/x/arch/x86/x86asm/testdata/Makefile b/...g.org/x/arch/x86/x86asm/testdata/Makefile → ...g.org/x/arch/x86/x86asm/testdata/Makefile
diff --git a/...org/x/arch/x86/x86asm/testdata/decode.txt → ...org/x/arch/x86/x86asm/testdata/decode.txt b/...org/x/arch/x86/x86asm/testdata/decode.txt → ...org/x/arch/x86/x86asm/testdata/decode.txt
diff --git a/...g/x/arch/x86/x86asm/testdata/libmach8db.c → ...g/x/arch/x86/x86asm/testdata/libmach8db.c b/...g/x/arch/x86/x86asm/testdata/libmach8db.c → ...g/x/arch/x86/x86asm/testdata/libmach8db.c
diff --git a/.../golang.org/x/arch/x86/x86asm/xed_test.go → .../golang.org/x/arch/x86/x86asm/xed_test.go b/.../golang.org/x/arch/x86/x86asm/xed_test.go → .../golang.org/x/arch/x86/x86asm/xed_test.go
diff --git a/...lang.org/x/arch/x86/x86asm/xedext_test.go → ...lang.org/x/arch/x86/x86asm/xedext_test.go b/...lang.org/x/arch/x86/x86asm/xedext_test.go → ...lang.org/x/arch/x86/x86asm/xedext_test.go
diff --git a/src/cmd/internal/unvendor/vendor.json → src/cmd/vendor/vendor.json b/src/cmd/internal/unvendor/vendor.json → src/cmd/vendor/vendor.json