wip refactor body

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

diff --git a/src/bin/client.rs b/src/bin/client.rs
index 00a27696a39690c27b3916d4698e2ad81cda3da9..1d3328d83a6bf83c8582abae9ad42a883a0c1f56 100644 (file)
--- a/src/bin/client.rs
+++ b/src/bin/client.rs
@@ -68,20 +68,28 @@ fn submit_request<'r, 'c:'r, C:HCC>(
        "#),
   );
 
+  macro_rules! content {
+    {} => {
+      itertools::chain![
+        array::IntoIter::new([
+          Ok::<Bytes,Void>( prefix1.into() ),
+          Ok::<Bytes,Void>( prefix2.into() ),
+        ]).take(
+          if upbound.is_empty() { 1 } else { 2 }
+        ),
+        Itertools::intersperse(
+          upbound.into_iter().map(|u| Bytes::from(u)),
+          SLIP_END_SLICE.into()
+        ).map(Ok::<Bytes,Void>),
+        [ Ok::<Bytes,Void>( suffix.into() ) ],
+      ]
+    }
+  }
+
   let body = hyper::body::Body::wrap_stream(
-    futures::stream::iter(itertools::chain![
-      array::IntoIter::new([
-        Ok::<Bytes,Void>( prefix1.into() ),
-        Ok::<Bytes,Void>( prefix2.into() ),
-      ]).take(
-        if upbound.is_empty() { 1 } else { 2 }
-      ),
-      Itertools::intersperse(
-        upbound.into_iter().map(|u| Bytes::from(u)),
-        SLIP_END_SLICE.into()
-      ).map(Ok::<Bytes,Void>),
-      [ Ok::<Bytes,Void>( suffix.into() ) ],
-    ])
+    futures::stream::iter(
+      content!()
+    )
   );
 
   let req = hyper::Request::post(&c.ic.url)