From: Ian Jackson Date: Mon, 31 May 2021 20:29:40 +0000 (+0100) Subject: mgmtchannels: Break out new() X-Git-Tag: otter-0.7.0~189 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=75211a6468effe27e959ef738ad35ec353a7d248;p=otter.git mgmtchannels: Break out new() Signed-off-by: Ian Jackson --- diff --git a/src/mgmtchannel.rs b/src/mgmtchannel.rs index 0d937044..6a8c8634 100644 --- a/src/mgmtchannel.rs +++ b/src/mgmtchannel.rs @@ -64,14 +64,18 @@ impl MgmtChannel { { let read = conn.try_clone().context("dup the command stream")?; let read = TimedFdReader::new(read).context("set up timed reader")?; - let read = FrameReader::new(read); let write = TimedFdWriter::new(conn).context("set up timed writerr")?; - let write = FrameWriter::new(write); - MgmtChannel { read, write } + MgmtChannel::new(read, write) } } impl MgmtChannel where R: Read, W: Write + Send { + pub fn new(read: R, write: W) -> Self { + let read = FrameReader::new(read); + let write = FrameWriter::new(write); + MgmtChannel { read, write } + } + pub fn read_inner_mut(&mut self) -> &mut R { self.read.inner_mut() }