From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 23 May 2021 23:28:20 +0000 (+0100)
Subject: accounts: Break out pct closure
X-Git-Tag: otter-0.7.0~231
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=a831a15c17b9e98faab3dd98677131f9ce5b3afc;p=otter.git

accounts: Break out pct closure

We're going to want to reuse it.

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

diff --git a/src/accounts.rs b/src/accounts.rs
index fb6f17e2..9c12ca23 100644
--- a/src/accounts.rs
+++ b/src/accounts.rs
@@ -122,6 +122,13 @@ impl AccountScope {
       percent_encoding::NON_ALPHANUMERIC
       .remove(b'-');
 
+    let pct = |n, f: &mut F| {
+      for frag in utf8_percent_encode(n, &ENCODE) {
+        f(frag)?;
+      }
+      Ok::<_,E>(())
+    };
+
     match &self {
       AS::Server => {
         f("server")?;
@@ -134,9 +141,7 @@ impl AccountScope {
     };
     for n in ns {
       f(":")?;
-      for frag in utf8_percent_encode(n, &ENCODE) {
-        f(frag)?;
-      }
+      pct(n, &mut f)?;
     }
   }