summaryrefslogtreecommitdiffhomepage
path: root/mullvad-cli/src
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2019-08-11 18:56:53 +0200
committerLinus Färnstrand <linus@mullvad.net>2019-08-12 16:27:58 +0200
commit7bce31bf0236b1ccbff0b3d6085cc21765f46c16 (patch)
tree80e8473d88423072a8c45626614e57075b99d224 /mullvad-cli/src
parentb695f3b802678057badc21e05bf94a86414001a6 (diff)
downloadmullvadvpn-7bce31bf0236b1ccbff0b3d6085cc21765f46c16.tar.xz
mullvadvpn-7bce31bf0236b1ccbff0b3d6085cc21765f46c16.zip
Replace ::std with just std
Diffstat (limited to 'mullvad-cli/src')
-rw-r--r--mullvad-cli/src/cmds/relay.rs4
-rw-r--r--mullvad-cli/src/location.rs4
2 files changed, 4 insertions, 4 deletions
diff --git a/mullvad-cli/src/cmds/relay.rs b/mullvad-cli/src/cmds/relay.rs
index fe411b06a2..13b26b79c6 100644
--- a/mullvad-cli/src/cmds/relay.rs
+++ b/mullvad-cli/src/cmds/relay.rs
@@ -250,7 +250,7 @@ impl Relay {
fn validate_wireguard_key(key_str: &str) -> [u8; 32] {
let key_bytes = base64::decode(key_str.trim()).unwrap_or_else(|e| {
eprintln!("Failed to decode wireguard key: {}", e);
- ::std::process::exit(1);
+ std::process::exit(1);
});
let mut key = [0u8; 32];
@@ -259,7 +259,7 @@ impl Relay {
"Expected key length to be 32 bytes, got {}",
key_bytes.len()
);
- ::std::process::exit(1);
+ std::process::exit(1);
}
key.copy_from_slice(&key_bytes);
diff --git a/mullvad-cli/src/location.rs b/mullvad-cli/src/location.rs
index 10b27b61d8..75fe237c81 100644
--- a/mullvad-cli/src/location.rs
+++ b/mullvad-cli/src/location.rs
@@ -52,7 +52,7 @@ pub fn get_constraint(matches: &clap::ArgMatches<'_>) -> Constraint<LocationCons
}
}
-fn country_code_validator(code: String) -> ::std::result::Result<(), String> {
+fn country_code_validator(code: String) -> std::result::Result<(), String> {
if code.len() == 2 || code == "any" {
Ok(())
} else {
@@ -60,7 +60,7 @@ fn country_code_validator(code: String) -> ::std::result::Result<(), String> {
}
}
-fn city_code_validator(code: String) -> ::std::result::Result<(), String> {
+fn city_code_validator(code: String) -> std::result::Result<(), String> {
if code.len() == 3 {
Ok(())
} else {