Adding upstream version 1.69.0+dfsg1.upstream/1.69.0+dfsg1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 12 insertions, 0 deletions

diff --git a/vendor/snap/src/error.rs b/vendor/snap/src/error.rs
index 8f0b400a6..99073aa0a 100644
--- a/vendor/snap/src/error.rs
+++ b/vendor/snap/src/error.rs
@@ -29,6 +29,13 @@ impl<W> IntoInnerError<W> {
         &self.err
     }
 
+    /// Returns the error which caused the call to `into_inner` to fail.
+    ///
+    /// This error was returned when attempting to flush the internal buffer.
+    pub fn into_error(self) -> io::Error {
+        self.err
+    }
+
     /// Returns the underlying writer which generated the error.
     ///
     /// The returned value can be used for error recovery, such as
diff --git a/vendor/snap/src/read.rs b/vendor/snap/src/read.rs
index a924bf91d..b78939cc5 100644
--- a/vendor/snap/src/read.rs
+++ b/vendor/snap/src/read.rs
@@ -94,6 +94,11 @@ impl<R: io::Read> FrameDecoder<R> {
     pub fn get_mut(&mut self) -> &mut R {
         &mut self.r
     }
+
+    /// Gets the underlying reader of this decoder.
+    pub fn into_inner(self) -> R {
+        self.r
+    }
 }
 
 impl<R: io::Read> io::Read for FrameDecoder<R> {