From 3f83a30e5d0f816ac6cd007b9575851d1f9fb68f Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 31 May 2021 11:58:42 +0100 Subject: [PATCH] otter cli: Rename SL::Socket from a daft long name Signed-off-by: Ian Jackson --- src/bin/otter.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bin/otter.rs b/src/bin/otter.rs index ede4e0db..566d229d 100644 --- a/src/bin/otter.rs +++ b/src/bin/otter.rs @@ -63,7 +63,7 @@ impl<'x, T, F: FnMut(&str) -> Result> #[derive(Debug)] enum ServerLocation { - LocalSocketPath(String), + Socket(String), } use ServerLocation as SL; @@ -386,7 +386,7 @@ fn main() { server .add_option(&["--socket"], MapStore(|path| Ok(Some( - SL::LocalSocketPath(path.to_string()) + SL::Socket(path.to_string()) ))), "connect to server via this socket socket path"); ap.refer(&mut rma.config_filename) @@ -458,7 +458,7 @@ fn main() { })?; let server = server.map(Ok::<_,APE>).unwrap_or_else(||{ - Ok(SL::LocalSocketPath( + Ok(SL::Socket( config.clone()?.0 .command_socket.clone() )) @@ -561,7 +561,7 @@ impl Conn { #[throws(E)] fn connect(ma: &MainOpts) -> Conn { let chan = match &ma.server { - SL::LocalSocketPath(socket) => MgmtChannel::connect(socket)?, + SL::Socket(socket) => MgmtChannel::connect(socket)?, }; let mut chan = Conn { chan }; if ma.superuser { -- 2.30.2