From: Ian Jackson Date: Sun, 26 Jul 2020 00:29:29 +0000 (+0100) Subject: wip cmds X-Git-Tag: otter-0.2.0~1257 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=1603fccff348ac4acafa4c67192f6a9abd40fc5f;p=otter.git wip cmds --- diff --git a/src/cmdlistener.rs b/src/cmdlistener.rs index 4173fe2c..07d1736f 100644 --- a/src/cmdlistener.rs +++ b/src/cmdlistener.rs @@ -36,11 +36,16 @@ type CSE = anyhow::Error; impl CommandStream<'_> { #[throws(CSE)] pub fn mainloop(mut self) { - for l in &mut self.read { - let l = l.context("read")?; - decode_and_process(&mut self, &l)?; - write!(&mut self.write, "\n")?; - self.write.flush()?; + loop { + match self.read.next() { + None => break, + Some(l) => { + let l = l.context("read")?; + decode_and_process(&mut self, &l)?; + write!(&mut self.write, "\n")?; + self.write.flush()?; + }, + } } } } diff --git a/src/commands.rs b/src/commands.rs index f9b72f7e..1436516b 100644 --- a/src/commands.rs +++ b/src/commands.rs @@ -5,7 +5,7 @@ use crate::imports::*; pub enum MgmtCommand { Noop { }, SetScope(ManagementScope), - AddPiece(Box), +// AddPiece(Box), } #[derive(Debug,Serialize,Deserialize)]