Replace simple getters with direct field access

7 files changed, 7 insertions, 7 deletions

diff --git a/mullvad-cli/src/cmds/auto_connect.rs b/mullvad-cli/src/cmds/auto_connect.rs
index bad4c5c1e6..385a2de7b6 100644
--- a/mullvad-cli/src/cmds/auto_connect.rs
+++ b/mullvad-cli/src/cmds/auto_connect.rs
@@ -49,7 +49,7 @@ impl AutoConnect {
 
     fn get(&self) -> Result<()> {
         let mut rpc = new_rpc_client()?;
-        let auto_connect = rpc.get_settings()?.get_auto_connect();
+        let auto_connect = rpc.get_settings()?.auto_connect;
         println!("Autoconnect: {}", if auto_connect { "on" } else { "off" });
         Ok(())
     }
diff --git a/mullvad-cli/src/cmds/beta_program.rs b/mullvad-cli/src/cmds/beta_program.rs
index c63027ccfd..602de81db0 100644
--- a/mullvad-cli/src/cmds/beta_program.rs
+++ b/mullvad-cli/src/cmds/beta_program.rs
@@ -29,7 +29,7 @@ impl Command for BetaProgram {
             ("get", Some(_)) => {
                 let mut rpc = new_rpc_client()?;
                 let settings = rpc.get_settings()?;
-                let enabled_str = if settings.get_show_beta_releases().unwrap_or(false) {
+                let enabled_str = if settings.show_beta_releases.unwrap_or(false) {
                     "on"
                 } else {
                     "off"
diff --git a/mullvad-cli/src/cmds/block_when_disconnected.rs b/mullvad-cli/src/cmds/block_when_disconnected.rs
index 9d9081a650..cd585720dd 100644
--- a/mullvad-cli/src/cmds/block_when_disconnected.rs
+++ b/mullvad-cli/src/cmds/block_when_disconnected.rs
@@ -49,7 +49,7 @@ impl BlockWhenDisconnected {
 
     fn get(&self) -> Result<()> {
         let mut rpc = new_rpc_client()?;
-        let block_when_disconnected = rpc.get_settings()?.get_block_when_disconnected();
+        let block_when_disconnected = rpc.get_settings()?.block_when_disconnected;
         println!(
             "Network traffic will be {} when the VPN is disconnected",
             if block_when_disconnected {
diff --git a/mullvad-cli/src/cmds/bridge.rs b/mullvad-cli/src/cmds/bridge.rs
index d0538e0d7c..0e5c339744 100644
--- a/mullvad-cli/src/cmds/bridge.rs
+++ b/mullvad-cli/src/cmds/bridge.rs
@@ -162,7 +162,7 @@ impl Bridge {
         let mut rpc = new_rpc_client()?;
         let settings = rpc.get_settings()?;
         println!("Bridge state - {}", settings.get_bridge_state());
-        match settings.get_bridge_settings() {
+        match settings.bridge_settings {
             BridgeSettings::Custom(proxy) => {
                 match proxy {
                     openvpn::ProxySettings::Local(local_proxy) => {
diff --git a/mullvad-cli/src/cmds/lan.rs b/mullvad-cli/src/cmds/lan.rs
index 3a29bdd226..15d30cde50 100644
--- a/mullvad-cli/src/cmds/lan.rs
+++ b/mullvad-cli/src/cmds/lan.rs
@@ -49,7 +49,7 @@ impl Lan {
 
     fn get(&self) -> Result<()> {
         let mut rpc = new_rpc_client()?;
-        let allow_lan = rpc.get_settings()?.get_allow_lan();
+        let allow_lan = rpc.get_settings()?.allow_lan;
         println!(
             "Local network sharing setting: {}",
             if allow_lan { "allow" } else { "block" }
diff --git a/mullvad-cli/src/cmds/tunnel.rs b/mullvad-cli/src/cmds/tunnel.rs
index 8b995cdc6b..5349174d4c 100644
--- a/mullvad-cli/src/cmds/tunnel.rs
+++ b/mullvad-cli/src/cmds/tunnel.rs
@@ -258,7 +258,7 @@ impl Tunnel {
 
     fn get_tunnel_options() -> Result<TunnelOptions> {
         let mut rpc = new_rpc_client()?;
-        Ok(rpc.get_settings()?.get_tunnel_options().clone())
+        Ok(rpc.get_settings()?.tunnel_options)
     }
 
     fn process_openvpn_mssfix_unset() -> Result<()> {
diff --git a/mullvad-cli/src/cmds/version.rs b/mullvad-cli/src/cmds/version.rs
index 2acde8f76f..99df7b6d19 100644
--- a/mullvad-cli/src/cmds/version.rs
+++ b/mullvad-cli/src/cmds/version.rs
@@ -20,7 +20,7 @@ impl Command for Version {
         println!("\tIs supported: {}", version_info.current_is_supported);
 
         let settings = rpc.get_settings()?;
-        let is_updated = if settings.get_show_beta_releases().unwrap_or(false) {
+        let is_updated = if settings.show_beta_releases.unwrap_or(false) {
             version_info.latest == current_version
         } else {
             version_info.latest_stable == current_version