Remove all workarounds for Go < 1.11

internal/backend/rclone/stdio_conn.go

@@ -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{}
 

internal/backend/rclone/stdio_conn_go110.go

@@ -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)
-}

internal/backend/rclone/stdio_conn_other.go

@@ -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
-}

internal/test/helper.go

@@ -1,5 +1,3 @@
-// +build go1.9
-
 package test
 
 import "testing"

internal/test/helper_go18.go

@@ -1,19 +0,0 @@
-// +build !go1.9
-
-package test
-
-import "testing"
-
-// Helperer marks the current function as a test helper.
-type Helperer interface {
-	Helper()
-}
-
-type fakeHelper struct{}
-
-func (fakeHelper) Helper() {}
-
-// Helper returns a function that marks the current function as a helper function.
-func Helper(t testing.TB) Helperer {
-	return fakeHelper{}
-}