diff options
| author | Erik Larkö <erik@mullvad.net> | 2017-09-11 08:11:02 +0200 |
|---|---|---|
| committer | Erik Larkö <erik@mullvad.net> | 2017-09-13 07:32:26 +0200 |
| commit | ef3413289fe3690335474efae8a8433b6e0b0acd (patch) | |
| tree | 42ab6363e77f55d39631f68dcbf5fa6a5ac1448f /mullvad-cli/src/cmds | |
| parent | 6f0b92ab5ed6d6b12664a052425dd94918e1110d (diff) | |
| download | mullvadvpn-ef3413289fe3690335474efae8a8433b6e0b0acd.tar.xz mullvadvpn-ef3413289fe3690335474efae8a8433b6e0b0acd.zip | |
Review fixes
Diffstat (limited to 'mullvad-cli/src/cmds')
| -rw-r--r-- | mullvad-cli/src/cmds/account.rs | 3 | ||||
| -rw-r--r-- | mullvad-cli/src/cmds/custom_relay.rs | 17 |
2 files changed, 9 insertions, 11 deletions
diff --git a/mullvad-cli/src/cmds/account.rs b/mullvad-cli/src/cmds/account.rs index 553458e11a..f7cb106fc3 100644 --- a/mullvad-cli/src/cmds/account.rs +++ b/mullvad-cli/src/cmds/account.rs @@ -1,5 +1,4 @@ -use Command; -use Result; +use {Command, Result}; use clap; use mullvad_types::account::{AccountData, AccountToken}; diff --git a/mullvad-cli/src/cmds/custom_relay.rs b/mullvad-cli/src/cmds/custom_relay.rs index 90b4b5bd0e..172040322e 100644 --- a/mullvad-cli/src/cmds/custom_relay.rs +++ b/mullvad-cli/src/cmds/custom_relay.rs @@ -1,7 +1,6 @@ pub struct CustomRelay; -use Command; -use Result; +use {Command, Result}; use clap; use mullvad_types::relay_endpoint::RelayEndpoint; @@ -16,22 +15,22 @@ impl Command for CustomRelay { fn clap_subcommand(&self) -> clap::App<'static, 'static> { clap::SubCommand::with_name(self.name()) - .about("Set or remove custom remote relay") + .about("Set or remove custom relay") .setting(clap::AppSettings::SubcommandRequired) .subcommand(clap::SubCommand::with_name("set") - .about("Set a custom remote relay") + .about("Set a custom relay") .arg(clap::Arg::with_name("host") - .help("The host name or IP of the remote relay") + .help("The host name or IP of the relay") .required(true)) .arg(clap::Arg::with_name("port") - .help("The port of the remote relay") + .help("The port of the relay") .required(true)) .arg(clap::Arg::with_name("protocol") - .help("The transport protocol. UDP is recommended as it usually results in higher throughput that TCP") + .help("The transport protocol. UDP is recommended as it usually results in higher throughput than TCP") .possible_values(&["udp", "tcp"]) .default_value("udp"))) .subcommand(clap::SubCommand::with_name("remove") - .about("Remove the custom remote server and use the default remotes instead")) + .about("Remove the custom relay and use the default relays instead")) } fn run(&self, matches: &clap::ArgMatches) -> Result<()> { @@ -61,7 +60,7 @@ impl CustomRelay { "set_custom_relay", &[relay_endpoint], ) - .map(|_: Option<()>| println!("Custom remote relay set")) + .map(|_: Option<()>| println!("Custom relay set")) } fn remove(&self) -> Result<()> { |