From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 1 Jun 2021 01:45:28 +0000 (+0100)
Subject: otter cli: Break out connect_chan
X-Git-Tag: otter-0.7.0~159
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=772d6b00e66ea44be7cfd40f6ac78642a1f976cc;p=otter.git

otter cli: Break out connect_chan

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

diff --git a/src/bin/otter.rs b/src/bin/otter.rs
index 7e3cf2fa..8a98a349 100644
--- a/src/bin/otter.rs
+++ b/src/bin/otter.rs
@@ -598,8 +598,8 @@ impl Conn {
 }
 
 #[throws(E)]
-fn connect(ma: &MainOpts) -> Conn {
-  let chan = match &ma.server {
+fn connect_chan(ma: &MainOpts) -> MgmtChannel {
+  match &ma.server {
 
     SL::Socket(socket) => {
       MgmtChannel::connect(socket)?
@@ -632,8 +632,12 @@ fn connect(ma: &MainOpts) -> Conn {
       MgmtChannel::new_boxed(r,w)
     },
 
-  };
+  }
+}
 
+#[throws(E)]
+fn connect(ma: &MainOpts) -> Conn {
+  let chan = connect_chan(ma)?;
   let mut chan = Conn { chan };
   if ma.superuser {
     chan.cmd(&MC::SetSuperuser(true))?;