TheArchive/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2025-08-13 06:47:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove all workarounds for Go < 1.11

Browse Source
This commit is contained in:
Alexander Neumann
2020-02-26 20:29:36 +01:00
parent 2464f7c4d1
commit 99fd80a585
7 changed files with 23 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
internal/backend/rclone/stdio_conn.go
View File

@@ -5,6 +5,7 @@ import (
"os"
"os/exec"
"sync"
"time"
"github.com/restic/restic/internal/debug"
)
@@ -58,6 +59,26 @@ func (s *StdioConn) RemoteAddr() net.Addr {
return Addr{}
}
// SetDeadline sets the read/write deadline.
func (s *StdioConn) SetDeadline(t time.Time) error {
err1 := s.stdin.SetReadDeadline(t)
err2 := s.stdout.SetWriteDeadline(t)
if err1 != nil {
return err1
}
return err2
}
// SetReadDeadline sets the read/write deadline.
func (s *StdioConn) SetReadDeadline(t time.Time) error {
return s.stdin.SetReadDeadline(t)
}
// SetWriteDeadline sets the read/write deadline.
func (s *StdioConn) SetWriteDeadline(t time.Time) error {
return s.stdout.SetWriteDeadline(t)
}
// make sure StdioConn implements net.Conn
var _ net.Conn = &StdioConn{}

25
internal/backend/rclone/stdio_conn_go110.go
View File

@@ -1,25 +0,0 @@
// +build go1.10
package rclone
import "time"
// SetDeadline sets the read/write deadline.
func (s *StdioConn) SetDeadline(t time.Time) error {
err1 := s.stdin.SetReadDeadline(t)
err2 := s.stdout.SetWriteDeadline(t)
if err1 != nil {
return err1
}
return err2
}
// SetReadDeadline sets the read/write deadline.
func (s *StdioConn) SetReadDeadline(t time.Time) error {
return s.stdin.SetReadDeadline(t)
}
// SetWriteDeadline sets the read/write deadline.
func (s *StdioConn) SetWriteDeadline(t time.Time) error {
return s.stdout.SetWriteDeadline(t)
}

22
internal/backend/rclone/stdio_conn_other.go
View File

@@ -1,22 +0,0 @@
// +build !go1.10
package rclone
import "time"
// On Go < 1.10, it's not possible to set read/write deadlines on files, so we just ignore that.
// SetDeadline sets the read/write deadline.
func (s *StdioConn) SetDeadline(t time.Time) error {
return nil
}
// SetReadDeadline sets the read/write deadline.
func (s *StdioConn) SetReadDeadline(t time.Time) error {
return nil
}
// SetWriteDeadline sets the read/write deadline.
func (s *StdioConn) SetWriteDeadline(t time.Time) error {
return nil
}