summaryrefslogtreecommitdiffhomepage
path: root/mullvad-cli/src
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2023-08-10 18:37:17 +0200
committerDavid Lönnhager <david.l@mullvad.net>2023-08-21 16:39:49 +0200
commit58fc8498458003f50e34d4f19296a3d9e014d10d (patch)
tree6ce124dadf47c816de01a9d6da97f6748f9c3479 /mullvad-cli/src
parentf547247627593aa45f0f67b7bb19c83168cd125d (diff)
downloadmullvadvpn-58fc8498458003f50e34d4f19296a3d9e014d10d.tar.xz
mullvadvpn-58fc8498458003f50e34d4f19296a3d9e014d10d.zip
Implement formatter for constraints
Diffstat (limited to 'mullvad-cli/src')
-rw-r--r--mullvad-cli/src/cmds/bridge.rs16
1 files changed, 10 insertions, 6 deletions
diff --git a/mullvad-cli/src/cmds/bridge.rs b/mullvad-cli/src/cmds/bridge.rs
index 3cc1a95b37..2ee7d9a4f0 100644
--- a/mullvad-cli/src/cmds/bridge.rs
+++ b/mullvad-cli/src/cmds/bridge.rs
@@ -3,8 +3,8 @@ use clap::Subcommand;
use mullvad_management_interface::MullvadProxyClient;
use mullvad_types::{
relay_constraints::{
- BridgeConstraints, BridgeSettings, BridgeState, Constraint, LocationConstraint, Ownership,
- Provider, Providers,
+ BridgeConstraints, BridgeConstraintsFormatter, BridgeSettings, BridgeState, Constraint,
+ LocationConstraint, Ownership, Provider, Providers,
},
relay_list::RelayEndpointData,
};
@@ -279,10 +279,14 @@ impl Bridge {
Self::print_shadowsocks_proxy(&shadowsocks_proxy)
}
},
- BridgeSettings::Normal(constraints) => {
- let mut buf = String::new();
- let _ = constraints.format(&mut buf, &settings.custom_lists);
- println!("Bridge constraints: {buf}")
+ BridgeSettings::Normal(ref constraints) => {
+ println!(
+ "Bridge constraints: {}",
+ BridgeConstraintsFormatter {
+ constraints,
+ custom_lists: &settings.custom_lists
+ }
+ )
}
};
Ok(())