diff options
author | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-09-12 23:22:53 +0000 |
---|---|---|
committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-09-12 23:22:53 +0000 |
commit | 656297e1fec9a127ff742df16958ee279ccacec5 (patch) | |
tree | 24347a35dacea36ce742c32c17420f3e31f17e3d /libgo/go/context | |
parent | d6ecb707cc5a58816d27908a7aa324c4b0bc67bb (diff) | |
download | gcc-656297e1fec9a127ff742df16958ee279ccacec5.zip gcc-656297e1fec9a127ff742df16958ee279ccacec5.tar.gz gcc-656297e1fec9a127ff742df16958ee279ccacec5.tar.bz2 |
libgo: update to Go1.13
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/194698
From-SVN: r275691
Diffstat (limited to 'libgo/go/context')
-rw-r--r-- | libgo/go/context/context.go | 4 | ||||
-rw-r--r-- | libgo/go/context/context_test.go | 5 |
2 files changed, 0 insertions, 9 deletions
diff --git a/libgo/go/context/context.go b/libgo/go/context/context.go index 05d01d0..6259085 100644 --- a/libgo/go/context/context.go +++ b/libgo/go/context/context.go @@ -49,7 +49,6 @@ package context import ( "errors" - "internal/oserror" "internal/reflectlite" "sync" "time" @@ -163,9 +162,6 @@ type deadlineExceededError struct{} func (deadlineExceededError) Error() string { return "context deadline exceeded" } func (deadlineExceededError) Timeout() bool { return true } func (deadlineExceededError) Temporary() bool { return true } -func (deadlineExceededError) Is(target error) bool { - return target == oserror.ErrTimeout || target == oserror.ErrTemporary -} // An emptyCtx is never canceled, has no values, and has no deadline. It is not // struct{}, since vars of this type must have distinct addresses. diff --git a/libgo/go/context/context_test.go b/libgo/go/context/context_test.go index 96ad146..b07a5cf 100644 --- a/libgo/go/context/context_test.go +++ b/libgo/go/context/context_test.go @@ -5,10 +5,8 @@ package context import ( - "errors" "fmt" "math/rand" - "os" "runtime" "strings" "sync" @@ -649,7 +647,4 @@ func XTestDeadlineExceededSupportsTimeout(t testingT) { if !i.Timeout() { t.Fatal("wrong value for timeout") } - if !errors.Is(DeadlineExceeded, os.ErrTimeout) { - t.Fatal("errors.Is(DeadlineExceeded, os.ErrTimeout) = false, want true") - } } |