From 82395bb7f1f01fcb8572b3701cc88466bdf4977e Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 17 Apr 2021 13:55:30 +0100
Subject: [PATCH] packetframe: tests: Move lump test to avoid warning

Otherwise LumpReader is present but dead code under miri.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 src/packetframe.rs | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/packetframe.rs b/src/packetframe.rs
index 203766c8..5b45feaf 100644
--- a/src/packetframe.rs
+++ b/src/packetframe.rs
@@ -380,30 +380,30 @@ fn write_test(){
   };
   read_all(&mut &*msg.buf);
 
-  #[derive(Debug)]
-  struct LumpReader<R: Read> {
-    inner: R,
-    inlump: usize,
-    lumpsize: usize,
-  }
-  impl<R:Read> LumpReader<R> {
-    fn new(lumpsize: usize, inner: R) -> Self {
-      LumpReader { inner, lumpsize, inlump: 0 }
+  #[cfg(not(miri))]
+  for lumpsize in 1..=msg.buf.len() {
+    #[derive(Debug)]
+    struct LumpReader<R: Read> {
+      inner: R,
+      inlump: usize,
+      lumpsize: usize,
     }
-  }
-  impl<R:Read> Read for LumpReader<R> {
-    #[throws(io::Error)]
-    fn read(&mut self, buf: &mut [u8]) -> usize {
-      if self.inlump == 0 { self.inlump = self.lumpsize }
-      let want = min(self.inlump, buf.len());
-      let r = self.inner.read(&mut buf[0..want])?;
-      self.inlump -= r;
-      r
+    impl<R:Read> LumpReader<R> {
+      fn new(lumpsize: usize, inner: R) -> Self {
+        LumpReader { inner, lumpsize, inlump: 0 }
+      }
+    }
+    impl<R:Read> Read for LumpReader<R> {
+      #[throws(io::Error)]
+      fn read(&mut self, buf: &mut [u8]) -> usize {
+        if self.inlump == 0 { self.inlump = self.lumpsize }
+        let want = min(self.inlump, buf.len());
+        let r = self.inner.read(&mut buf[0..want])?;
+        self.inlump -= r;
+        r
+      }
     }
-  }
 
-  #[cfg(not(miri))]
-  for lumpsize in 1..=msg.buf.len() {
     dbgc!(lumpsize);
     let mut lr = LumpReader::new(lumpsize, &*msg.buf);
     read_all(&mut lr);
-- 
2.30.2