From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 9 Aug 2021 00:29:01 +0000 (+0100)
Subject: server: use meta.need
X-Git-Tag: hippotat/1.0.0~192
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=hippotat.git;a=commitdiff_plain;h=7c0be818e1dbe204a2f5de746987e4c19e436a7c

server: use meta.need

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

diff --git a/src/bin/server.rs b/src/bin/server.rs
index c5eaf92..42e3785 100644
--- a/src/bin/server.rs
+++ b/src/bin/server.rs
@@ -90,12 +90,7 @@ async fn handle(
 
     let mut meta = MetadataFieldIterator::new(comp.payload_start);
 
-    let client = meta.next()
-      .map(|r| r.map_err(Into::into))
-      .unwrap_or_else(|| Err(anyhow!("missing")))
-      .context("client addr")?;
-
-    let client: IpAddr = client.parse().context("client address")?;
+    let client: ClientName = meta.need().context("client addr")?;
 // let client = all_clients.get(&client).ok_or_else(|| anyhow!(BAD_CLIENT))?;
 
     eprintln!("boundary={:?} start={} name={:?} client={}",
diff --git a/src/multipart.rs b/src/multipart.rs
index 5099f05..0eaabda 100644
--- a/src/multipart.rs
+++ b/src/multipart.rs
@@ -90,7 +90,7 @@ impl<'b> MetadataFieldIterator<'b> {
   #[throws(AE)]
   pub fn need<T>(&mut self) -> T
   where T: FromStr,
-        T::Err: std::error::Error + Sync + Send + 'static,
+        AE: From<T::Err>,
   {
     self.parse()?.ok_or_else(|| anyhow!("missing"))?
   }
@@ -98,7 +98,7 @@ impl<'b> MetadataFieldIterator<'b> {
   #[throws(AE)]
   pub fn parse<T>(&mut self) -> Option<T>
   where T: FromStr,
-        T::Err: std::error::Error + Sync + Send + 'static,
+        AE: From<T::Err>,
   {
     let s = if let Some(r) = self.next() { r? } else { return None };
     Some(s.parse()?)