Merge pull request #995 from thaJeztah/replace_ioutil

Remove uses of deprecated io/ioutil

util/logutil/filter.go

@@ -1,7 +1,7 @@
 package logutil
 
 import (
-	"io/ioutil"
+	"io"
 	"strings"
 
 	"github.com/sirupsen/logrus"
@@ -9,7 +9,7 @@ import (
 
 func NewFilter(levels []logrus.Level, filters ...string) logrus.Hook {
 	dl := logrus.New()
-	dl.SetOutput(ioutil.Discard)
+	dl.SetOutput(io.Discard)
 	return &logsFilter{
 		levels:        levels,
 		filters:       filters,

util/progress/fromreader.go

@@ -2,7 +2,6 @@ package progress
 
 import (
 	"io"
-	"io/ioutil"
 	"time"
 
 	"github.com/moby/buildkit/client"
@@ -24,7 +23,7 @@ func FromReader(w Writer, name string, rc io.ReadCloser) {
 		Vertexes: []*client.Vertex{&vtx},
 	})
 
-	_, err := io.Copy(ioutil.Discard, rc)
+	_, err := io.Copy(io.Discard, rc)
 
 	tm2 := time.Now()
 	vtx2 := vtx

util/progress/printer.go

@@ -3,7 +3,6 @@ package progress
 import (
 	"context"
 	"io"
-	"io/ioutil"
 	"os"
 	"sync"
 
@@ -88,7 +87,7 @@ func NewPrinter(ctx context.Context, w io.Writer, out console.File, mode string)
 		var c console.Console
 		switch mode {
 		case PrinterModeQuiet:
-			w = ioutil.Discard
+			w = io.Discard
 		case PrinterModeAuto, PrinterModeTty:
 			if cons, err := console.ConsoleFromFile(out); err == nil {
 				c = cons