os,text,unicode: renamings

This is Go 1 package renaming CL #4.
This one merely moves the source; the import strings will be
changed after the next weekly release.
This one moves pieces into os, text, and unicode.

exec -> os/exec
scanner -> text/scanner
tabwriter -> text/tabwriter
template -> text/template
template/parse -> text/template/parse
utf16 -> unicode/utf16
utf8 -> unicode/utf8

This should be the last of the source-rearranging CLs.

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/5331066

43 files changed, 35 insertions, 21 deletions

diff --git a/src/pkg/Makefile b/src/pkg/Makefile
index 691eda4a08..e9286441c2 100644
--- a/src/pkg/Makefile
+++ b/src/pkg/Makefile
@@ -77,7 +77,6 @@ DIRS=\
 	encoding/pem\
 	encoding/xml\
 	errors\
-	exec\
 	exp/ebnf\
 	exp/ebnflint\
 	exp/gotype\
@@ -142,6 +141,7 @@ DIRS=\
 	old/regexp\
 	old/template\
 	os\
+	os/exec\
 	os/signal\
 	os/user\
 	patch\
@@ -154,24 +154,24 @@ DIRS=\
 	runtime/cgo\
 	runtime/debug\
 	runtime/pprof\
-	scanner\
 	sort\
 	strconv\
 	strings\
 	sync\
 	sync/atomic\
 	syscall\
-	tabwriter\
-	template\
-	template/parse\
 	testing\
 	testing/iotest\
 	testing/quick\
 	testing/script\
+	text/scanner\
+	text/tabwriter\
+	text/template\
+	text/template/parse\
 	time\
 	unicode\
-	utf16\
-	utf8\
+	unicode/utf16\
+	unicode/utf8\
 	websocket\
 	../cmd/cgo\
 	../cmd/godoc\
diff --git a/src/pkg/deps.bash b/src/pkg/deps.bash
index d17e1c7cf1..ad752a093e 100755
--- a/src/pkg/deps.bash
+++ b/src/pkg/deps.bash
@@ -29,6 +29,7 @@ dirpat="$dirpat
 /^(big)$/
 /^(cmath)$/
 /^(csv)$/
+/^(exec)$/
 /^(exp\/template\/html)$/
 /^(gob)$/
 /^(http)/
@@ -40,9 +41,15 @@ dirpat="$dirpat
 /^(mail)$/
 /^(rand)$/
 /^(rpc)$/
+/^(scanner)$/
 /^(smtp)$/
 /^(syslog)$/
+/^(tabwriter)$/
 /^(url)$/
+/^(template)$/
+/^(template\/parse)$/
+/^(utf16)$/
+/^(utf8)$/
 /^(xml)$/
 "
 
@@ -67,6 +74,7 @@ for dir in $dirs; do (
 		s;^big.install$;math/big.install;
 		s;^cmath.install$;math/cmplx.install;
 		s;^csv.install$;encoding/csv.install;
+		s;^exec.install$;os/exec.install;
 		s;^exp/template/html.install$;html/template.install;
 		s;^gob.install$;encoding/gob.install;
 		s;^http.install$;net/http.install;
@@ -78,10 +86,16 @@ for dir in $dirs; do (
 		s;^mail.install$;net/mail.install;
 		s;^rpc.install$;net/rpc.install;
 		s;^rpc/jsonrpc.install$;net/rpc/jsonrpc.install;
+		s;^scanner.install$;text/scanner.install;
 		s;^smtp.install$;net/smtp.install;
 		s;^syslog.install$;log/syslog.install;
+		s;^tabwriter.install$;text/tabwriter.install;
+		s;^template.install$;text/template.install;
+		s;^template/parse.install$;text/template/parse.install;
 		s;^rand.install$;math/rand.install;
 		s;^url.install$;net/url.install;
+		s;^utf16.install$;unicode/utf16.install;
+		s;^utf8.install$;unicode/utf8.install;
 		s;^xml.install$;encoding/xml.install;' |
 		# TODO: end of renamings.
 		sed 's;^C\.install;runtime/cgo.install;' |
diff --git a/src/pkg/exec/Makefile b/src/pkg/os/exec/Makefile
index ba19d0e4d0..702d6a3827 100644
--- a/src/pkg/exec/Makefile
+++ b/src/pkg/os/exec/Makefile
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../Make.inc
+include ../../../Make.inc
 
 TARG=exec
 GOFILES=\
@@ -28,4 +28,4 @@ GOFILES_plan9=\
 
 GOFILES+=$(GOFILES_$(GOOS))
 
-include ../../Make.pkg
+include ../../../Make.pkg
diff --git a/src/pkg/exec/exec.go b/src/pkg/os/exec/exec.go
index ebdfd54a73..ebdfd54a73 100644
--- a/src/pkg/exec/exec.go
+++ b/src/pkg/os/exec/exec.go
diff --git a/src/pkg/exec/exec_test.go b/src/pkg/os/exec/exec_test.go
index 8f63653c01..8f63653c01 100644
--- a/src/pkg/exec/exec_test.go
+++ b/src/pkg/os/exec/exec_test.go
diff --git a/src/pkg/exec/lp_plan9.go b/src/pkg/os/exec/lp_plan9.go
index d4ffc17c00..d4ffc17c00 100644
--- a/src/pkg/exec/lp_plan9.go
+++ b/src/pkg/os/exec/lp_plan9.go
diff --git a/src/pkg/exec/lp_test.go b/src/pkg/os/exec/lp_test.go
index 77d8e848c7..77d8e848c7 100644
--- a/src/pkg/exec/lp_test.go
+++ b/src/pkg/os/exec/lp_test.go
diff --git a/src/pkg/exec/lp_unix.go b/src/pkg/os/exec/lp_unix.go
index d234641acc..d234641acc 100644
--- a/src/pkg/exec/lp_unix.go
+++ b/src/pkg/os/exec/lp_unix.go
diff --git a/src/pkg/exec/lp_windows.go b/src/pkg/os/exec/lp_windows.go
index db326236ee..db326236ee 100644
--- a/src/pkg/exec/lp_windows.go
+++ b/src/pkg/os/exec/lp_windows.go
diff --git a/src/pkg/scanner/Makefile b/src/pkg/text/scanner/Makefile
index db4752513a..6b6e075dfe 100644
--- a/src/pkg/scanner/Makefile
+++ b/src/pkg/text/scanner/Makefile
@@ -2,10 +2,10 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../Make.inc
+include ../../../Make.inc
 
 TARG=scanner
 GOFILES=\
 	scanner.go\
 
-include ../../Make.pkg
+include ../../../Make.pkg
diff --git a/src/pkg/scanner/scanner.go b/src/pkg/text/scanner/scanner.go
index 9e230174ca..9e230174ca 100644
--- a/src/pkg/scanner/scanner.go
+++ b/src/pkg/text/scanner/scanner.go
diff --git a/src/pkg/scanner/scanner_test.go b/src/pkg/text/scanner/scanner_test.go
index b07e559e1a..b07e559e1a 100644
--- a/src/pkg/scanner/scanner_test.go
+++ b/src/pkg/text/scanner/scanner_test.go
diff --git a/src/pkg/tabwriter/Makefile b/src/pkg/text/tabwriter/Makefile
index bdc888784b..70ad25cea7 100644
--- a/src/pkg/tabwriter/Makefile
+++ b/src/pkg/text/tabwriter/Makefile
@@ -2,10 +2,10 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../Make.inc
+include ../../../Make.inc
 
 TARG=tabwriter
 GOFILES=\
 	tabwriter.go\
 
-include ../../Make.pkg
+include ../../../Make.pkg
diff --git a/src/pkg/tabwriter/tabwriter.go b/src/pkg/text/tabwriter/tabwriter.go
index d588b385d2..d588b385d2 100644
--- a/src/pkg/tabwriter/tabwriter.go
+++ b/src/pkg/text/tabwriter/tabwriter.go
diff --git a/src/pkg/tabwriter/tabwriter_test.go b/src/pkg/text/tabwriter/tabwriter_test.go
index 1ffb330d43..1ffb330d43 100644
--- a/src/pkg/tabwriter/tabwriter_test.go
+++ b/src/pkg/text/tabwriter/tabwriter_test.go
diff --git a/src/pkg/template/Makefile b/src/pkg/text/template/Makefile
index 730b287aff..159b5a7c2f 100644
--- a/src/pkg/template/Makefile
+++ b/src/pkg/text/template/Makefile
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../Make.inc
+include ../../../Make.inc
 
 TARG=template
 GOFILES=\
@@ -13,4 +13,4 @@ GOFILES=\
 	parse.go\
 	set.go\
 
-include ../../Make.pkg
+include ../../../Make.pkg
diff --git a/src/pkg/template/doc.go b/src/pkg/text/template/doc.go
index 42f9e560be..42f9e560be 100644
--- a/src/pkg/template/doc.go
+++ b/src/pkg/text/template/doc.go
diff --git a/src/pkg/template/exec.go b/src/pkg/text/template/exec.go
index 228477ce79..228477ce79 100644
--- a/src/pkg/template/exec.go
+++ b/src/pkg/text/template/exec.go
diff --git a/src/pkg/template/exec_test.go b/src/pkg/text/template/exec_test.go
index e32de4d40f..e32de4d40f 100644
--- a/src/pkg/template/exec_test.go
+++ b/src/pkg/text/template/exec_test.go
diff --git a/src/pkg/template/funcs.go b/src/pkg/text/template/funcs.go
index 26c3a6e848..26c3a6e848 100644
--- a/src/pkg/template/funcs.go
+++ b/src/pkg/text/template/funcs.go
diff --git a/src/pkg/template/helper.go b/src/pkg/text/template/helper.go
index a743a8326e..a743a8326e 100644
--- a/src/pkg/template/helper.go
+++ b/src/pkg/text/template/helper.go
diff --git a/src/pkg/template/parse.go b/src/pkg/text/template/parse.go
index 2fbd37ffa9..2fbd37ffa9 100644
--- a/src/pkg/template/parse.go
+++ b/src/pkg/text/template/parse.go
diff --git a/src/pkg/template/parse/Makefile b/src/pkg/text/template/parse/Makefile
index fe65858097..39986b943c 100644
--- a/src/pkg/template/parse/Makefile
+++ b/src/pkg/text/template/parse/Makefile
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../../Make.inc
+include ../../../../Make.inc
 
 TARG=template/parse
 GOFILES=\
@@ -11,4 +11,4 @@ GOFILES=\
 	parse.go\
 	set.go\
 
-include ../../../Make.pkg
+include ../../../../Make.pkg
diff --git a/src/pkg/template/parse/lex.go b/src/pkg/text/template/parse/lex.go
index 04c105d161..04c105d161 100644
--- a/src/pkg/template/parse/lex.go
+++ b/src/pkg/text/template/parse/lex.go
diff --git a/src/pkg/template/parse/lex_test.go b/src/pkg/text/template/parse/lex_test.go
index 6ee1b47010..6ee1b47010 100644
--- a/src/pkg/template/parse/lex_test.go
+++ b/src/pkg/text/template/parse/lex_test.go
diff --git a/src/pkg/template/parse/node.go b/src/pkg/text/template/parse/node.go
index a4e5514768..a4e5514768 100644
--- a/src/pkg/template/parse/node.go
+++ b/src/pkg/text/template/parse/node.go
diff --git a/src/pkg/template/parse/parse.go b/src/pkg/text/template/parse/parse.go
index 1b6ab3af4f..1b6ab3af4f 100644
--- a/src/pkg/template/parse/parse.go
+++ b/src/pkg/text/template/parse/parse.go
diff --git a/src/pkg/template/parse/parse_test.go b/src/pkg/text/template/parse/parse_test.go
index f05f6e3874..f05f6e3874 100644
--- a/src/pkg/template/parse/parse_test.go
+++ b/src/pkg/text/template/parse/parse_test.go
diff --git a/src/pkg/template/parse/set.go b/src/pkg/text/template/parse/set.go
index d363eeff08..d363eeff08 100644
--- a/src/pkg/template/parse/set.go
+++ b/src/pkg/text/template/parse/set.go
diff --git a/src/pkg/template/set.go b/src/pkg/text/template/set.go
index bd0dfc6b36..bd0dfc6b36 100644
--- a/src/pkg/template/set.go
+++ b/src/pkg/text/template/set.go
diff --git a/src/pkg/template/set_test.go b/src/pkg/text/template/set_test.go
index f437bc779c..f437bc779c 100644
--- a/src/pkg/template/set_test.go
+++ b/src/pkg/text/template/set_test.go
diff --git a/src/pkg/template/testdata/file1.tmpl b/src/pkg/text/template/testdata/file1.tmpl
index febf9d9f89..febf9d9f89 100644
--- a/src/pkg/template/testdata/file1.tmpl
+++ b/src/pkg/text/template/testdata/file1.tmpl
diff --git a/src/pkg/template/testdata/file2.tmpl b/src/pkg/text/template/testdata/file2.tmpl
index 39bf6fb9ee..39bf6fb9ee 100644
--- a/src/pkg/template/testdata/file2.tmpl
+++ b/src/pkg/text/template/testdata/file2.tmpl
diff --git a/src/pkg/template/testdata/tmpl1.tmpl b/src/pkg/text/template/testdata/tmpl1.tmpl
index 3d15b81735..3d15b81735 100644
--- a/src/pkg/template/testdata/tmpl1.tmpl
+++ b/src/pkg/text/template/testdata/tmpl1.tmpl
diff --git a/src/pkg/template/testdata/tmpl2.tmpl b/src/pkg/text/template/testdata/tmpl2.tmpl
index a374d2fe7f..a374d2fe7f 100644
--- a/src/pkg/template/testdata/tmpl2.tmpl
+++ b/src/pkg/text/template/testdata/tmpl2.tmpl
diff --git a/src/pkg/utf16/Makefile b/src/pkg/unicode/utf16/Makefile
index 8a564fb0fd..b60a5e7316 100644
--- a/src/pkg/utf16/Makefile
+++ b/src/pkg/unicode/utf16/Makefile
@@ -2,10 +2,10 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../Make.inc
+include ../../../Make.inc
 
 TARG=utf16
 GOFILES=\
 	utf16.go\
 
-include ../../Make.pkg
+include ../../../Make.pkg
diff --git a/src/pkg/utf16/utf16.go b/src/pkg/unicode/utf16/utf16.go
index 2b2eb28f2d..2b2eb28f2d 100644
--- a/src/pkg/utf16/utf16.go
+++ b/src/pkg/unicode/utf16/utf16.go
diff --git a/src/pkg/utf16/utf16_test.go b/src/pkg/unicode/utf16/utf16_test.go
index 7ea290a529..7ea290a529 100644
--- a/src/pkg/utf16/utf16_test.go
+++ b/src/pkg/unicode/utf16/utf16_test.go
diff --git a/src/pkg/utf8/Makefile b/src/pkg/unicode/utf8/Makefile
index b3574ba3b4..4ffc31f08a 100644
--- a/src/pkg/utf8/Makefile
+++ b/src/pkg/unicode/utf8/Makefile
@@ -2,11 +2,11 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../Make.inc
+include ../../../Make.inc
 
 TARG=utf8
 GOFILES=\
 	string.go\
 	utf8.go\
 
-include ../../Make.pkg
+include ../../../Make.pkg
diff --git a/src/pkg/utf8/string.go b/src/pkg/unicode/utf8/string.go
index 443decf056..443decf056 100644
--- a/src/pkg/utf8/string.go
+++ b/src/pkg/unicode/utf8/string.go
diff --git a/src/pkg/utf8/string_test.go b/src/pkg/unicode/utf8/string_test.go
index 920d2a0ea3..920d2a0ea3 100644
--- a/src/pkg/utf8/string_test.go
+++ b/src/pkg/unicode/utf8/string_test.go
diff --git a/src/pkg/utf8/utf8.go b/src/pkg/unicode/utf8/utf8.go
index a5f9983b33..a5f9983b33 100644
--- a/src/pkg/utf8/utf8.go
+++ b/src/pkg/unicode/utf8/utf8.go
diff --git a/src/pkg/utf8/utf8_test.go b/src/pkg/unicode/utf8/utf8_test.go
index 857bcf6e1a..857bcf6e1a 100644
--- a/src/pkg/utf8/utf8_test.go
+++ b/src/pkg/unicode/utf8/utf8_test.go