From f75af8c1464e948b5e166cf5ab09ebf0d82fc253 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Mon, 27 Jul 2020 22:27:54 -0700 Subject: libgo: update to go1.15rc1 Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/245157 --- libgo/go/net/pipe.go | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'libgo/go/net/pipe.go') diff --git a/libgo/go/net/pipe.go b/libgo/go/net/pipe.go index 9177fc4..f174193 100644 --- a/libgo/go/net/pipe.go +++ b/libgo/go/net/pipe.go @@ -6,6 +6,7 @@ package net import ( "io" + "os" "sync" "time" ) @@ -78,12 +79,6 @@ func isClosedChan(c <-chan struct{}) bool { } } -type timeoutError struct{} - -func (timeoutError) Error() string { return "deadline exceeded" } -func (timeoutError) Timeout() bool { return true } -func (timeoutError) Temporary() bool { return true } - type pipeAddr struct{} func (pipeAddr) Network() string { return "pipe" } @@ -158,7 +153,7 @@ func (p *pipe) read(b []byte) (n int, err error) { case isClosedChan(p.remoteDone): return 0, io.EOF case isClosedChan(p.readDeadline.wait()): - return 0, timeoutError{} + return 0, os.ErrDeadlineExceeded } select { @@ -171,7 +166,7 @@ func (p *pipe) read(b []byte) (n int, err error) { case <-p.remoteDone: return 0, io.EOF case <-p.readDeadline.wait(): - return 0, timeoutError{} + return 0, os.ErrDeadlineExceeded } } @@ -190,7 +185,7 @@ func (p *pipe) write(b []byte) (n int, err error) { case isClosedChan(p.remoteDone): return 0, io.ErrClosedPipe case isClosedChan(p.writeDeadline.wait()): - return 0, timeoutError{} + return 0, os.ErrDeadlineExceeded } p.wrMu.Lock() // Ensure entirety of b is written together @@ -206,7 +201,7 @@ func (p *pipe) write(b []byte) (n int, err error) { case <-p.remoteDone: return n, io.ErrClosedPipe case <-p.writeDeadline.wait(): - return n, timeoutError{} + return n, os.ErrDeadlineExceeded } } return n, nil -- cgit v1.1