1 files changed, 13 insertions, 8 deletions
diff --git a/vendor/codeberg.org/gruf/go-iotools/read.go b/vendor/codeberg.org/gruf/go-iotools/read.go
index 6ce2789a7..13c5e21ac 100644
--- a/vendor/codeberg.org/gruf/go-iotools/read.go
+++ b/vendor/codeberg.org/gruf/go-iotools/read.go
@@ -4,6 +4,16 @@ import (
 	"io"
 )
 
+// ReadCloserType implements io.ReadCloser
+// by combining the two underlying interfaces,
+// while providing an exported type to still
+// access the underlying original io.Reader or
+// io.Closer separately (e.g. without wrapping).
+type ReadCloserType struct {
+	io.Reader
+	io.Closer
+}
+
 // ReaderFunc is a function signature which allows
 // a function to implement the io.Reader type.
 type ReaderFunc func([]byte) (int, error)
@@ -22,15 +32,10 @@ func (rf ReaderFromFunc) ReadFrom(r io.Reader) (int64, error) {
 
 // ReadCloser wraps an io.Reader and io.Closer in order to implement io.ReadCloser.
 func ReadCloser(r io.Reader, c io.Closer) io.ReadCloser {
-	return &struct {
-		io.Reader
-		io.Closer
-	}{r, c}
+	return &ReadCloserType{r, c}
 }
 
-// NopReadCloser wraps an io.Reader to implement io.ReadCloser with empty io.Closer implementation.
+// NopReadCloser wraps io.Reader with NopCloser{} in ReadCloserType.
 func NopReadCloser(r io.Reader) io.ReadCloser {
-	return ReadCloser(r, CloserFunc(func() error {
-		return nil
-	}))
+	return &ReadCloserType{r, NopCloser{}}
 }