From: Ian Jackson Date: Sat, 11 Jul 2020 22:52:21 +0000 (+0100) Subject: debugread to its own file X-Git-Tag: otter-0.2.0~1379 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=fe6651db3618345f08568f74e939748024c2794a;p=otter.git debugread to its own file --- diff --git a/src/debugreader.rs b/src/debugreader.rs new file mode 100644 index 00000000..bb905074 --- /dev/null +++ b/src/debugreader.rs @@ -0,0 +1,14 @@ +#[derive(Debug)] +pub struct DebugReader(pub T); + +impl Read for DebugReader { + fn read(&mut self, buf: &mut [u8]) -> Result { + let l = buf.len(); + eprintln!("DebugReader({:?}).read()...", l); + let r = self.0.read(buf); + eprintln!("DebugReader({:?}).read() = {:?} {:?}", l, &r, + r.as_ref().map(|&r| str::from_utf8(&buf[0..r]))); + r + } +} + diff --git a/src/sse.rs b/src/sse.rs index 0b566389..71d539ca 100644 --- a/src/sse.rs +++ b/src/sse.rs @@ -148,20 +148,6 @@ impl Read for UpdateReader { } } -#[derive(Debug)] -pub struct DebugReader(pub T); - -impl Read for DebugReader { - fn read(&mut self, buf: &mut [u8]) -> Result { - let l = buf.len(); - eprintln!("DebugReader({:?}).read()...", l); - let r = self.0.read(buf); - eprintln!("DebugReader({:?}).read() = {:?} {:?}", l, &r, - r.as_ref().map(|&r| str::from_utf8(&buf[0..r]))); - r - } -} - #[throws(OE)] pub fn content(iad : InstanceAccessDetails, gen: Generation) -> impl Read {