From: Tobias Klauser <tklauser@distanz.ch>
Date: Tue, 9 Mar 2021 09:38:30 +0000 (+0100)
Subject: net: use io.Discard in TestSendfileOnWriteTimeoutExceeded
X-Git-Tag: go1.17beta1~1227
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=034fffdb490ade3cbccd79eacdb9370850ef51d1;p=gostls13.git

net: use io.Discard in TestSendfileOnWriteTimeoutExceeded

Replace ioutil.Discard which is deprecated as of Go 1.16.

This was already done in CL 263142 but accidentially re-introduced in
CL 285914.

Change-Id: Ife0944d416294b1ba7c8f6b602aa68a3b9213c50
Reviewed-on: https://go-review.googlesource.com/c/go/+/299989
Trust: Tobias Klauser <tobias.klauser@gmail.com>
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
Reviewed-by: Emmanuel Odeke <emmanuel@orijtech.com>
TryBot-Result: Go Bot <gobot@golang.org>
---

diff --git a/src/net/sendfile_test.go b/src/net/sendfile_test.go
index db72daa328..54e51fa0ab 100644
--- a/src/net/sendfile_test.go
+++ b/src/net/sendfile_test.go
@@ -14,7 +14,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"runtime"
 	"sync"
@@ -367,7 +366,7 @@ func TestSendfileOnWriteTimeoutExceeded(t *testing.T) {
 	}
 	defer conn.Close()
 
-	n, err := io.Copy(ioutil.Discard, conn)
+	n, err := io.Copy(io.Discard, conn)
 	if err != nil {
 		t.Fatalf("expected nil error, but got %v", err)
 	}