time: don't depend on the io package

bradfitz · bradfitz · commit d88261fb6581 · 2016-05-09T20:31:47.000Z
The time package has never depended on the io package until a recent change during Go 1.7 to use the io.Seek* constants. The go/build dependency check didn't catch this because "time" was allowed to depend on meta package group "L0", which included "io". Adding the "io" package broke one of Dmitry's tools. The tool is fixable, but it's also not necessary for us to depend on "io" at all for some constants. Mirror the constants instead, and change deps_test.go to prevent an io dependency in the future. Change-Id: I74325228565279a74fa4a2f419643f5710e3e09f Reviewed-on: https://go-review.googlesource.com/22960 Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Ian Lance Taylor <iant@golang.org>
diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
@@ -136,7 +136,19 @@ var pkgDeps = map[string][]string{
 	"internal/syscall/unix":             {"L0", "syscall"},
 	"internal/syscall/windows":          {"L0", "syscall", "internal/syscall/windows/sysdll"},
 	"internal/syscall/windows/registry": {"L0", "syscall", "internal/syscall/windows/sysdll", "unicode/utf16"},
-	"time":          {"L0", "syscall", "internal/syscall/windows/registry"},
+	"time": {
+		// "L0" without the "io" package:
+		"errors",
+		"runtime",
+		"runtime/internal/atomic",
+		"sync",
+		"sync/atomic",
+		"unsafe",
+		// Other time dependencies:
+		"internal/syscall/windows/registry",
+		"syscall",
+	},
+
 	"os":            {"L1", "os", "syscall", "time", "internal/syscall/windows"},
 	"path/filepath": {"L2", "os", "syscall"},
 	"io/ioutil":     {"L2", "os", "path/filepath", "time"},
diff --git a/src/time/sys_plan9.go b/src/time/sys_plan9.go
@@ -8,7 +8,6 @@ package time
 
 import (
 	"errors"
-	"io"
 	"syscall"
 )
 
@@ -56,9 +55,9 @@ func closefd(fd uintptr) {
 }
 
 func preadn(fd uintptr, buf []byte, off int) error {
-	whence := io.SeekStart
+	whence := seekStart
 	if off < 0 {
-		whence = io.SeekEnd
+		whence = seekEnd
 	}
 	if _, err := syscall.Seek(int(fd), int64(off), whence); err != nil {
 		return err
diff --git a/src/time/sys_unix.go b/src/time/sys_unix.go
@@ -8,7 +8,6 @@ package time
 
 import (
 	"errors"
-	"io"
 	"syscall"
 )
 
@@ -56,9 +55,9 @@ func closefd(fd uintptr) {
 }
 
 func preadn(fd uintptr, buf []byte, off int) error {
-	whence := io.SeekStart
+	whence := seekStart
 	if off < 0 {
-		whence = io.SeekEnd
+		whence = seekEnd
 	}
 	if _, err := syscall.Seek(int(fd), int64(off), whence); err != nil {
 		return err
diff --git a/src/time/sys_windows.go b/src/time/sys_windows.go
@@ -6,7 +6,6 @@ package time
 
 import (
 	"errors"
-	"io"
 	"syscall"
 )
 
@@ -53,9 +52,9 @@ func closefd(fd uintptr) {
 }
 
 func preadn(fd uintptr, buf []byte, off int) error {
-	whence := io.SeekStart
+	whence := seekStart
 	if off < 0 {
-		whence = io.SeekEnd
+		whence = seekEnd
 	}
 	if _, err := syscall.Seek(syscall.Handle(fd), int64(off), whence); err != nil {
 		return err
diff --git a/src/time/zoneinfo_read.go b/src/time/zoneinfo_read.go
@@ -11,6 +11,13 @@ package time
 
 import "errors"
 
+// Copies of io.Seek* constants to avoid importing "io":
+const (
+	seekStart   = 0
+	seekCurrent = 1
+	seekEnd     = 2
+)
+
 // Simple I/O interface to binary blob of data.
 type data struct {
 	p     []byte

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ package time`
`8`	`8`
`9`	`9`	`import (`
`10`	`10`	`"errors"`
`11`		`- "io"`
`12`	`11`	`"syscall"`
`13`	`12`	`)`
`14`	`13`
`@@ -56,9 +55,9 @@ func closefd(fd uintptr) {`
`56`	`55`	`}`
`57`	`56`
`58`	`57`	`func preadn(fd uintptr, buf []byte, off int) error {`
`59`		`- whence := io.SeekStart`
	`58`	`+ whence := seekStart`
`60`	`59`	`if off < 0 {`
`61`		`- whence = io.SeekEnd`
	`60`	`+ whence = seekEnd`
`62`	`61`	`}`
`63`	`62`	`if _, err := syscall.Seek(int(fd), int64(off), whence); err != nil {`
`64`	`63`	`return err`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ package time`
`6`	`6`
`7`	`7`	`import (`
`8`	`8`	`"errors"`
`9`		`- "io"`
`10`	`9`	`"syscall"`
`11`	`10`	`)`
`12`	`11`
`@@ -53,9 +52,9 @@ func closefd(fd uintptr) {`
`53`	`52`	`}`
`54`	`53`
`55`	`54`	`func preadn(fd uintptr, buf []byte, off int) error {`
`56`		`- whence := io.SeekStart`
	`55`	`+ whence := seekStart`
`57`	`56`	`if off < 0 {`
`58`		`- whence = io.SeekEnd`
	`57`	`+ whence = seekEnd`
`59`	`58`	`}`
`60`	`59`	`if _, err := syscall.Seek(syscall.Handle(fd), int64(off), whence); err != nil {`
`61`	`60`	`return err`