From 239d0f8999b47e9e76589ee1fa2d9f3459c47335 Mon Sep 17 00:00:00 2001
From: notgne2
Date: Mon, 28 Sep 2020 15:45:53 -0700
Subject: use separate binary for activation, more cleanup

---
 src/utils/data.rs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/utils/data.rs')

diff --git a/src/utils/data.rs b/src/utils/data.rs
index b28b6cd..0753508 100644
--- a/src/utils/data.rs
+++ b/src/utils/data.rs
@@ -14,10 +14,12 @@ pub struct GenericSettings {
     )]
     #[merge(strategy = merge::vec::append)]
     pub ssh_opts: Vec<String>,
-    #[serde(rename(deserialize = "fastConnection"))]
-    pub fast_connection: Option<bool>,
-    #[serde(rename(deserialize = "autoRollback"))]
-    pub auto_rollback: Option<String>,
+    #[serde(rename(deserialize = "fastConnection"), default)]
+    #[merge(strategy = merge::bool::overwrite_false)]
+    pub fast_connection: bool,
+    #[serde(rename(deserialize = "autoRollback"), default)]
+    #[merge(strategy = merge::bool::overwrite_false)]
+    pub auto_rollback: bool,
 }
 
 #[derive(Deserialize, Debug, Clone)]
-- 
cgit v1.2.3