diff options
Diffstat (limited to 'libgo/go/os/error.go')
| -rw-r--r-- | libgo/go/os/error.go | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/libgo/go/os/error.go b/libgo/go/os/error.go index 26bfe4c..875cc97 100644 --- a/libgo/go/os/error.go +++ b/libgo/go/os/error.go @@ -18,11 +18,12 @@ var ( // Methods on File will return this error when the receiver is nil. ErrInvalid = errInvalid() // "invalid argument" - ErrPermission = errPermission() // "permission denied" - ErrExist = errExist() // "file already exists" - ErrNotExist = errNotExist() // "file does not exist" - ErrClosed = errClosed() // "file already closed" - ErrNoDeadline = errNoDeadline() // "file type does not support deadline" + ErrPermission = errPermission() // "permission denied" + ErrExist = errExist() // "file already exists" + ErrNotExist = errNotExist() // "file does not exist" + ErrClosed = errClosed() // "file already closed" + ErrNoDeadline = errNoDeadline() // "file type does not support deadline" + ErrDeadlineExceeded = errDeadlineExceeded() // "i/o timeout" ) func errInvalid() error { return oserror.ErrInvalid } @@ -32,6 +33,15 @@ func errNotExist() error { return oserror.ErrNotExist } func errClosed() error { return oserror.ErrClosed } func errNoDeadline() error { return poll.ErrNoDeadline } +// errDeadlineExceeded returns the value for os.ErrDeadlineExceeded. +// This error comes from the internal/poll package, which is also +// used by package net. Doing this this way ensures that the net +// package will return os.ErrDeadlineExceeded for an exceeded deadline, +// as documented by net.Conn.SetDeadline, without requiring any extra +// work in the net package and without requiring the internal/poll +// package to import os (which it can't, because that would be circular). +func errDeadlineExceeded() error { return poll.ErrDeadlineExceeded } + type timeout interface { Timeout() bool } |