diff options
author | Matthias Beyer <matthias.beyer@ifm.com> | 2022-02-04 12:10:01 +0100 |
---|---|---|
committer | Matthias Beyer <matthias.beyer@ifm.com> | 2022-02-23 09:11:34 +0100 |
commit | 6601e96d34e2db5e75d13a662a422a3ae9673a86 (patch) | |
tree | 7caaa97629dd7a77db352711b2edd9c9c0566f68 /crates/core | |
parent | 701fd47181464114a2d71937d33a2cad0b61d519 (diff) |
Remove unneeded `return` keyword
Signed-off-by: Matthias Beyer <matthias.beyer@ifm.com>
Diffstat (limited to 'crates/core')
-rw-r--r-- | crates/core/tedge/src/cli/connect/c8y_direct_connection.rs | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/crates/core/tedge/src/cli/connect/c8y_direct_connection.rs b/crates/core/tedge/src/cli/connect/c8y_direct_connection.rs index 049429b2..a15e62d3 100644 --- a/crates/core/tedge/src/cli/connect/c8y_direct_connection.rs +++ b/crates/core/tedge/src/cli/connect/c8y_direct_connection.rs @@ -140,10 +140,8 @@ fn parse_pkcs8_key( let f = File::open(&key_file)?; let mut key_reader = BufReader::new(f); match pkcs8_private_keys(&mut key_reader) { - Ok(key) if key.len() > 0 => return Ok(key[0].clone()), - _ => { - return Err(ConnectError::UnknownPrivateKeyFormat); - } + Ok(key) if key.len() > 0 => Ok(key[0].clone()), + _ => Err(ConnectError::UnknownPrivateKeyFormat), } } @@ -153,10 +151,8 @@ fn parse_rsa_key( let f = File::open(&key_file)?; let mut key_reader = BufReader::new(f); match rsa_private_keys(&mut key_reader) { - Ok(key) if key.len() > 0 => return Ok(key[0].clone()), - _ => { - return Err(ConnectError::UnknownPrivateKeyFormat); - } + Ok(key) if key.len() > 0 => Ok(key[0].clone()), + _ => Err(ConnectError::UnknownPrivateKeyFormat), } } @@ -165,14 +161,7 @@ fn read_cert_chain( ) -> Result<Vec<rustls_0_19::Certificate>, ConnectError> { let f = File::open(cert_file)?; let mut cert_reader = BufReader::new(f); - let result = certs(&mut cert_reader); - let cert_chain: Vec<rustls_0_19::Certificate> = match result { - Ok(cert) => cert, - Err(_) => { - return Err(ConnectError::RumqttcCertificate); - } - }; - Ok(cert_chain) + certs(&mut cert_reader).map_err(|_| ConnectError::RumqttcCertificate) } #[cfg(test)] |