buffered-reader: Add Debug trait bound to Cookie.

2 files changed, 10 insertions, 10 deletions

diff --git a/openpgp/src/crypto/symmetric.rs b/openpgp/src/crypto/symmetric.rs
index 09de7448..089efd5d 100644
--- a/openpgp/src/crypto/symmetric.rs
+++ b/openpgp/src/crypto/symmetric.rs
@@ -193,11 +193,11 @@ impl<R: io::Read> io::Read for Decryptor<R> {
 
 /// A `BufferedReader` that decrypts symmetrically-encrypted data as
 /// it is read.
-pub(crate) struct BufferedReaderDecryptor<R: BufferedReader<C>, C> {
+pub(crate) struct BufferedReaderDecryptor<R: BufferedReader<C>, C: fmt::Debug> {
     reader: buffered_reader::Generic<Decryptor<R>, C>,
 }
 
-impl <R: BufferedReader<C>, C> BufferedReaderDecryptor<R, C> {
+impl <R: BufferedReader<C>, C: fmt::Debug> BufferedReaderDecryptor<R, C> {
     /// Like `new()`, but sets a cookie, which can be retrieved using
     /// the `cookie_ref` and `cookie_mut` methods, and set using
     /// the `cookie_set` method.
@@ -212,19 +212,19 @@ impl <R: BufferedReader<C>, C> BufferedReaderDecryptor<R, C> {
     }
 }
 
-impl<R: BufferedReader<C>, C> io::Read for BufferedReaderDecryptor<R, C> {
+impl<R: BufferedReader<C>, C: fmt::Debug> io::Read for BufferedReaderDecryptor<R, C> {
     fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
         self.reader.read(buf)
     }
 }
 
-impl<R: BufferedReader<C>, C> fmt::Display for BufferedReaderDecryptor<R, C> {
+impl<R: BufferedReader<C>, C: fmt::Debug> fmt::Display for BufferedReaderDecryptor<R, C> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(f, "BufferedReaderDecryptor")
     }
 }
 
-impl<R: BufferedReader<C>, C> fmt::Debug for BufferedReaderDecryptor<R, C> {
+impl<R: BufferedReader<C>, C: fmt::Debug> fmt::Debug for BufferedReaderDecryptor<R, C> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         f.debug_struct("BufferedReaderDecryptor")
             .field("reader", &self.get_ref().unwrap())
@@ -232,7 +232,7 @@ impl<R: BufferedReader<C>, C> fmt::Debug for BufferedReaderDecryptor<R, C> {
     }
 }
 
-impl<R: BufferedReader<C>, C> BufferedReader<C>
+impl<R: BufferedReader<C>, C: fmt::Debug> BufferedReader<C>
         for BufferedReaderDecryptor<R, C> {
     fn buffer(&self) -> &[u8] {
         return self.reader.buffer();
diff --git a/openpgp/src/parse.rs b/openpgp/src/parse.rs
index dcb9cc5b..17b3928c 100644
--- a/openpgp/src/parse.rs
+++ b/openpgp/src/parse.rs
@@ -1112,7 +1112,7 @@ impl<'a> Parse<'a, S2K> for S2K {
 }
 
 impl Header {
-    pub(crate) fn parse<R: BufferedReader<C>, C> (bio: &mut R)
+    pub(crate) fn parse<R: BufferedReader<C>, C: fmt::Debug> (bio: &mut R)
         -> Result<Header>
     {
         let ctb = CTB::try_from(bio.data_consume_hard(1)?[0])?;
@@ -1143,7 +1143,7 @@ impl BodyLength {
     /// 4.2.2 of RFC 4880].
     ///
     ///   [Section 4.2.2 of RFC 4880]: https://tools.ietf.org/html/rfc4880#section-4.2.2
-    pub(crate) fn parse_new_format<T: BufferedReader<C>, C> (bio: &mut T)
+    pub(crate) fn parse_new_format<T: BufferedReader<C>, C: fmt::Debug> (bio: &mut T)
         -> io::Result<BodyLength>
     {
         let octet1 : u8 = bio.data_consume_hard(1)?[0];
@@ -1166,7 +1166,7 @@ impl BodyLength {
     /// 4.2.1 of RFC 4880].
     ///
     ///   [Section 4.2.1 of RFC 4880]: https://tools.ietf.org/html/rfc4880#section-4.2.1
-    pub(crate) fn parse_old_format<T: BufferedReader<C>, C>
+    pub(crate) fn parse_old_format<T: BufferedReader<C>, C: fmt::Debug>
         (bio: &mut T, length_type: PacketLengthType)
          -> Result<BodyLength>
     {
@@ -1753,7 +1753,7 @@ impl Subpacket {
 
 impl SubpacketLength {
     /// Parses a subpacket length.
-    fn parse<R: BufferedReader<C>, C>(bio: &mut R) -> Result<Self> {
+    fn parse<R: BufferedReader<C>, C: fmt::Debug>(bio: &mut R) -> Result<Self> {
         let octet1 = bio.data_consume_hard(1)?[0];
         if octet1 < 192 {
             // One octet.