diff options
| author | Gustav Sörnäs <gustav@sornas.net> | 2021-04-11 22:00:04 +0200 |
|---|---|---|
| committer | Gustav Sörnäs <gustav@sornas.net> | 2021-04-11 22:00:04 +0200 |
| commit | 1be49aaaab973eccf6f47cab36a4f3530143445a (patch) | |
| tree | d137fb2a36fb9dd607d15dae5e460b9648608978 | |
| parent | dc318b332a0f75349744684f8b05ff188611cbc0 (diff) | |
| download | mum-1be49aaaab973eccf6f47cab36a4f3530143445a.tar.gz | |
? -> into
| -rw-r--r-- | mumctl/src/main.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mumctl/src/main.rs b/mumctl/src/main.rs index dbd62c6..5abed50 100644 --- a/mumctl/src/main.rs +++ b/mumctl/src/main.rs @@ -301,7 +301,7 @@ fn match_opt() -> Result<(), Error> { } } _ => { - return Err(CliError::ConfigKeyNotFound(key))?; + return Err(CliError::ConfigKeyNotFound(key).into()); } }, Command::ConfigReload => { @@ -477,7 +477,7 @@ fn match_server_command(server_command: Server, config: &mut Config) -> Result<( password, } => { if config.servers.iter().any(|s| s.name == name) { - return Err(CliError::ServerAlreadyExists(name))?; + return Err(CliError::ServerAlreadyExists(name).into()); } else { config.servers.push(ServerConfig { name, @@ -498,7 +498,7 @@ fn match_server_command(server_command: Server, config: &mut Config) -> Result<( } Server::List => { if config.servers.is_empty() { - return Err(CliError::NoServers)?; + return Err(CliError::NoServers.into()); } let longest = config @@ -542,11 +542,11 @@ fn match_server_command(server_command: Server, config: &mut Config) -> Result<( } Ok(Err(e)) => { error!("{}", e); - return Err(e)?; + return Err(e.into()); } Err(e) => { error!("{}", e); - return Err(e)?; + return Err(e.into()); } } } |