diff options
| author | Giuliano Belinassi <giuliano.belinassi@usp.br> | 2020-08-22 17:43:43 -0300 |
|---|---|---|
| committer | Giuliano Belinassi <giuliano.belinassi@usp.br> | 2020-08-22 17:43:43 -0300 |
| commit | a926878ddbd5a98b272c22171ce58663fc04c3e0 (patch) | |
| tree | 86af256e5d9a9c06263c00adc90e5fe348008c43 /libgo/go/net/dial.go | |
| parent | 542730f087133690b47e036dfd43eb0db8a650ce (diff) | |
| parent | 07cbaed8ba7d1b6e4ab3a9f44175502a4e1ecdb1 (diff) | |
| download | gcc-devel/autopar_devel.zip gcc-devel/autopar_devel.tar.gz gcc-devel/autopar_devel.tar.bz2 | |
Merge branch 'autopar_rebase2' into autopar_develdevel/autopar_devel
Quickly commit changes in the rebase branch.
Diffstat (limited to 'libgo/go/net/dial.go')
| -rw-r--r-- | libgo/go/net/dial.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libgo/go/net/dial.go b/libgo/go/net/dial.go index d8be1c2..13a312a 100644 --- a/libgo/go/net/dial.go +++ b/libgo/go/net/dial.go @@ -7,7 +7,6 @@ package net import ( "context" "internal/nettrace" - "internal/poll" "syscall" "time" ) @@ -141,7 +140,7 @@ func partialDeadline(now, deadline time.Time, addrsRemaining int) (time.Time, er } timeRemaining := deadline.Sub(now) if timeRemaining <= 0 { - return time.Time{}, poll.ErrTimeout + return time.Time{}, errTimeout } // Tentatively allocate equal time to each remaining address. timeout := timeRemaining / time.Duration(addrsRemaining) |