From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 16 Apr 2021 21:27:31 +0000 (+0100)
Subject: packetframe: Break out expect_boom
X-Git-Tag: otter-0.6.0~576
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=758f75b9c884f089b7ba8a5be7efc1cfcb9ea837;p=otter.git

packetframe: Break out expect_boom

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

diff --git a/src/packetframe.rs b/src/packetframe.rs
index bee20d5d..0efc2953 100644
--- a/src/packetframe.rs
+++ b/src/packetframe.rs
@@ -285,7 +285,8 @@ fn write_test(){
     let y = frame.read(&mut buf).unwrap();
     dbgc!(&buf[0..y]);
   }
-  {
+  let expect_boom = |rd: &mut FrameReader<_>| {
+    let mut buf = [0u8;10];
     let mut frame = rd.new_frame().unwrap();
     let y = frame.read(&mut buf).unwrap();
     dbgc!(&buf[0..y]);
@@ -293,5 +294,6 @@ fn write_test(){
     dbgc!(&r);
     assert_eq!(r.kind(), ErrorKind::Other);
     assert!(r.into_inner().unwrap().is::<SenderError>());
-  }
+  };
+  expect_boom(&mut rd);
 }