diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2019-09-11 14:38:10 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2019-09-13 11:28:56 +0200 |
| commit | 05576ff6ee4864d715ebe1cb1e84dd7b34d7e76a (patch) | |
| tree | 5ef08a63d3fc16e05e52ce63066749077920b18d /mullvad-cli/src | |
| parent | e4fcee8525c1e43cc1d681d3763ae2be58c03657 (diff) | |
| download | mullvadvpn-05576ff6ee4864d715ebe1cb1e84dd7b34d7e76a.tar.xz mullvadvpn-05576ff6ee4864d715ebe1cb1e84dd7b34d7e76a.zip | |
Sort countries/cities on lowercase names in CLI
Diffstat (limited to 'mullvad-cli/src')
| -rw-r--r-- | mullvad-cli/src/cmds/bridge.rs | 11 | ||||
| -rw-r--r-- | mullvad-cli/src/cmds/relay.rs | 11 |
2 files changed, 16 insertions, 6 deletions
diff --git a/mullvad-cli/src/cmds/bridge.rs b/mullvad-cli/src/cmds/bridge.rs index fa80c3fa40..5986e413d7 100644 --- a/mullvad-cli/src/cmds/bridge.rs +++ b/mullvad-cli/src/cmds/bridge.rs @@ -323,7 +323,8 @@ impl Bridge { .cities .into_iter() .filter_map(|mut city| { - city.relays.retain(|relay| relay.active && !relay.bridges.is_empty()); + city.relays + .retain(|relay| relay.active && !relay.bridges.is_empty()); if !city.relays.is_empty() { Some(city) } else { @@ -339,9 +340,13 @@ impl Bridge { }) .collect(); - locations.countries.sort_by(|c1, c2| c1.name.cmp(&c2.name)); + locations + .countries + .sort_by(|c1, c2| c1.name.to_lowercase().cmp(&c2.name.to_lowercase())); for mut country in locations.countries { - country.cities.sort_by(|c1, c2| c1.name.cmp(&c2.name)); + country + .cities + .sort_by(|c1, c2| c1.name.to_lowercase().cmp(&c2.name.to_lowercase())); println!("{} ({})", country.name, country.code); for city in &country.cities { println!( diff --git a/mullvad-cli/src/cmds/relay.rs b/mullvad-cli/src/cmds/relay.rs index c281732b5e..272e2e6193 100644 --- a/mullvad-cli/src/cmds/relay.rs +++ b/mullvad-cli/src/cmds/relay.rs @@ -324,7 +324,8 @@ impl Relay { .cities .into_iter() .filter_map(|mut city| { - city.relays.retain(|relay| relay.active && !relay.tunnels.is_empty()); + city.relays + .retain(|relay| relay.active && !relay.tunnels.is_empty()); if !city.relays.is_empty() { Some(city) } else { @@ -340,9 +341,13 @@ impl Relay { }) .collect(); - locations.countries.sort_by(|c1, c2| c1.name.cmp(&c2.name)); + locations + .countries + .sort_by(|c1, c2| c1.name.to_lowercase().cmp(&c2.name.to_lowercase())); for mut country in locations.countries { - country.cities.sort_by(|c1, c2| c1.name.cmp(&c2.name)); + country + .cities + .sort_by(|c1, c2| c1.name.to_lowercase().cmp(&c2.name.to_lowercase())); println!("{} ({})", country.name, country.code); for city in &country.cities { println!( |