summaryrefslogtreecommitdiffstats
path: root/buffered-reader/src/lib.rs
diff options
context:
space:
mode:
authorNora Widdecke <nora@sequoia-pgp.org>2020-11-02 10:24:25 +0100
committerNora Widdecke <nora@sequoia-pgp.org>2020-11-09 13:06:59 +0100
commit8712c52b31b1ed16a1470adb46cf3f7fd7cc65e8 (patch)
tree8b9758728c041ea0e666d6c4b08d268415100e3b /buffered-reader/src/lib.rs
parent41bcc909751d8f465e2c557276f53935d54e5e9c (diff)
buffered-reader: Add Debug trait bound to Cookie.
Diffstat (limited to 'buffered-reader/src/lib.rs')
-rw-r--r--buffered-reader/src/lib.rs12
1 files changed, 7 insertions, 5 deletions
diff --git a/buffered-reader/src/lib.rs b/buffered-reader/src/lib.rs
index 79a9cb63..2b9a37b9 100644
--- a/buffered-reader/src/lib.rs
+++ b/buffered-reader/src/lib.rs
@@ -297,7 +297,9 @@ fn vec_truncate(v: &mut Vec<u8>, len: usize) {
}
/// The generic `BufferReader` interface.
-pub trait BufferedReader<C> : io::Read + fmt::Debug + fmt::Display {
+pub trait BufferedReader<C> : io::Read + fmt::Debug + fmt::Display
+ where C: fmt::Debug
+{
/// Returns a reference to the internal buffer.
///
/// Note: this returns the same data as `self.data(0)`, but it
@@ -884,7 +886,7 @@ pub trait BufferedReader<C> : io::Read + fmt::Debug + fmt::Display {
///
/// but, alas, Rust doesn't like that ("error\[E0119\]: conflicting
/// implementations of trait `std::io::Read` for type `&mut _`").
-pub fn buffered_reader_generic_read_impl<T: BufferedReader<C>, C>
+pub fn buffered_reader_generic_read_impl<T: BufferedReader<C>, C: fmt::Debug>
(bio: &mut T, buf: &mut [u8]) -> Result<usize, io::Error> {
match bio.data_consume(buf.len()) {
Ok(inner) => {
@@ -897,7 +899,7 @@ pub fn buffered_reader_generic_read_impl<T: BufferedReader<C>, C>
}
/// Make a `Box<BufferedReader>` look like a BufferedReader.
-impl <'a, C> BufferedReader<C> for Box<dyn BufferedReader<C> + 'a> {
+impl <'a, C: fmt::Debug> BufferedReader<C> for Box<dyn BufferedReader<C> + 'a> {
fn buffer(&self) -> &[u8] {
return self.as_ref().buffer();
}
@@ -995,7 +997,7 @@ impl <'a, C> BufferedReader<C> for Box<dyn BufferedReader<C> + 'a> {
//
// for i in $(seq 0 9999); do printf "%04d\n" $i; done > buffered-reader-test.txt
#[cfg(test)]
-fn buffered_reader_test_data_check<'a, T: BufferedReader<C> + 'a, C>(bio: &mut T) {
+fn buffered_reader_test_data_check<'a, T: BufferedReader<C> + 'a, C: fmt::Debug>(bio: &mut T) {
use std::str;
for i in 0 .. 10000 {
@@ -1049,7 +1051,7 @@ mod test {
}
#[cfg(test)]
- fn buffered_reader_read_test_aux<'a, T: BufferedReader<C> + 'a, C>
+ fn buffered_reader_read_test_aux<'a, T: BufferedReader<C> + 'a, C: fmt::Debug>
(mut bio: T, data: &[u8]) {
let mut buffer = [0; 99];