From 39f1abb1fba5db868d002edabe28939b2c835f13 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 10 Jan 2025 14:21:16 +0100 Subject: [PATCH 1/2] pkg/ioutils: remove deprecated NopWriter Signed-off-by: Sebastiaan van Stijn --- pkg/ioutils/writers.go | 9 --------- pkg/ioutils/writers_test.go | 11 ----------- 2 files changed, 20 deletions(-) diff --git a/pkg/ioutils/writers.go b/pkg/ioutils/writers.go index b896f16ebc..559bdc056e 100644 --- a/pkg/ioutils/writers.go +++ b/pkg/ioutils/writers.go @@ -5,15 +5,6 @@ import ( "sync/atomic" ) -// NopWriter represents a type which write operation is nop. -// -// Deprecated: use [io.Discard] instead. This type will be removed in the next release. -type NopWriter struct{} - -func (*NopWriter) Write(buf []byte) (int, error) { - return len(buf), nil -} - type nopWriteCloser struct { io.Writer } diff --git a/pkg/ioutils/writers_test.go b/pkg/ioutils/writers_test.go index 10b06fb662..96bda17a1e 100644 --- a/pkg/ioutils/writers_test.go +++ b/pkg/ioutils/writers_test.go @@ -27,14 +27,3 @@ func TestNopWriteCloser(t *testing.T) { t.Fatal("NopWriteCloser always return nil on Close.") } } - -func TestNopWriter(t *testing.T) { - nw := &NopWriter{} - l, err := nw.Write([]byte{'c'}) - if err != nil { - t.Fatal(err) - } - if l != 1 { - t.Fatalf("Expected 1 got %d", l) - } -} From ce8d3d1c78e7d398a51848f04ce9070045b05824 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 10 Jan 2025 14:22:12 +0100 Subject: [PATCH 2/2] pkg/ioutils: remove deprecated NopWriteCloser Signed-off-by: Sebastiaan van Stijn --- pkg/ioutils/writers.go | 13 ------------- pkg/ioutils/writers_test.go | 8 -------- 2 files changed, 21 deletions(-) diff --git a/pkg/ioutils/writers.go b/pkg/ioutils/writers.go index 559bdc056e..9c2d5d3b70 100644 --- a/pkg/ioutils/writers.go +++ b/pkg/ioutils/writers.go @@ -5,19 +5,6 @@ import ( "sync/atomic" ) -type nopWriteCloser struct { - io.Writer -} - -func (w *nopWriteCloser) Close() error { return nil } - -// NopWriteCloser returns a nopWriteCloser. -// -// Deprecated: This function is no longer used and will be removed in the next release. -func NopWriteCloser(w io.Writer) io.WriteCloser { - return &nopWriteCloser{w} -} - type writeCloserWrapper struct { io.Writer closer func() error diff --git a/pkg/ioutils/writers_test.go b/pkg/ioutils/writers_test.go index 96bda17a1e..cecd4b42a9 100644 --- a/pkg/ioutils/writers_test.go +++ b/pkg/ioutils/writers_test.go @@ -19,11 +19,3 @@ func TestWriteCloserWrapperClose(t *testing.T) { t.Fatalf("writeCloserWrapper should have call the anonymous function.") } } - -func TestNopWriteCloser(t *testing.T) { - writer := bytes.NewBuffer([]byte{}) - wrapper := NopWriteCloser(writer) - if err := wrapper.Close(); err != nil { - t.Fatal("NopWriteCloser always return nil on Close.") - } -}