From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 17 Apr 2021 19:12:50 +0000 (+0100)
Subject: packetframe: Make badeof into a fn rather than a closure
X-Git-Tag: otter-0.6.0~541
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=e0d4a2a0f1ca0855c47b1d098a87d747a6468bf5;p=otter.git

packetframe: Make badeof into a fn rather than a closure

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/src/packetframe.rs b/src/packetframe.rs
index c1f9307e..e6587703 100644
--- a/src/packetframe.rs
+++ b/src/packetframe.rs
@@ -154,6 +154,8 @@ impl ReaderState {
   }
 }
 
+fn badeof() -> ReadError { RE::IO(io::ErrorKind::UnexpectedEof.into()) }
+
 impl<R:Read> FrameReader<R> {
   pub fn new(r: R) -> FrameReader<R> where R:BufRead {
     Self::new_unbuf(r)
@@ -179,7 +181,6 @@ impl<R:Read> FrameReader<R> {
 
   #[throws(ReadError)]
   fn do_read(&mut self, buf: &mut [u8]) -> usize {
-    let badeof = || RE::IO(io::ErrorKind::UnexpectedEof.into());
     assert_ne!(buf.len(), 0);
     let remaining = match self.state {
       Idle => panic!(),