summaryrefslogtreecommitdiffhomepage
path: root/mullvad-cli/src/cmds
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2019-06-12 15:52:48 +0200
committerLinus Färnstrand <linus@mullvad.net>2019-06-12 15:52:48 +0200
commitaad18e3f08e798a660d445d78184d441d7eae2f8 (patch)
treec38a9bfd9cb23378a4a06296a192f4ba9a798e44 /mullvad-cli/src/cmds
parentd4a6e0b411b72f9e14eb6caee6c91dd31b612acf (diff)
parent7f06e0a42b8479a018c0bd14371d1395d2625def (diff)
downloadmullvadvpn-aad18e3f08e798a660d445d78184d441d7eae2f8.tar.xz
mullvadvpn-aad18e3f08e798a660d445d78184d441d7eae2f8.zip
Merge branch 'clippy-cleanup'
Diffstat (limited to 'mullvad-cli/src/cmds')
-rw-r--r--mullvad-cli/src/cmds/relay.rs2
-rw-r--r--mullvad-cli/src/cmds/tunnel.rs4
2 files changed, 3 insertions, 3 deletions
diff --git a/mullvad-cli/src/cmds/relay.rs b/mullvad-cli/src/cmds/relay.rs
index 965107057d..c9bf61be43 100644
--- a/mullvad-cli/src/cmds/relay.rs
+++ b/mullvad-cli/src/cmds/relay.rs
@@ -222,7 +222,7 @@ impl Relay {
let mut private_key_str = String::new();
println!("Reading private key from standard input");
let _ = io::stdin().lock().read_line(&mut private_key_str);
- if private_key_str.trim().len() == 0 {
+ if private_key_str.trim().is_empty() {
eprintln!("Expected to read private key from standard input");
}
let private_key = Self::validate_wireguard_key(&private_key_str).into();
diff --git a/mullvad-cli/src/cmds/tunnel.rs b/mullvad-cli/src/cmds/tunnel.rs
index 136290d5bb..7eacdddb78 100644
--- a/mullvad-cli/src/cmds/tunnel.rs
+++ b/mullvad-cli/src/cmds/tunnel.rs
@@ -134,7 +134,7 @@ impl Tunnel {
.wireguard
.mtu
.map(|mtu| mtu.to_string())
- .unwrap_or("unset".into())
+ .unwrap_or_else(|| "unset".to_owned())
);
Ok(())
}
@@ -193,7 +193,7 @@ impl Tunnel {
tunnel_options
.openvpn
.mssfix
- .map_or_else(|| "unset".to_string(), |v| v.to_string())
+ .map_or_else(|| "unset".to_owned(), |v| v.to_string())
);
Ok(())
}