refactor: mark types as non_exhaustive

crabnebula-dev · Nov 30, 2023 · 0d12f48 · 0d12f48
1 parent 7c8e3b7
commit 0d12f48
Show file tree

Hide file tree

Showing 14 changed files with 1,307 additions and 398 deletions.
diff --git a/.changes/non-exhuastive.md b/.changes/non-exhuastive.md
@@ -0,0 +1,5 @@
+---
+"cargo-packager": minor
+---
+
+Mark most of the types as `non_exhaustive` to allow adding more field later on without having to break downstream users use the newly added helper methods on these types to modify the corresponding fields in-place.
diff --git a/bindings/updater/nodejs/src/from_impls.rs b/bindings/updater/nodejs/src/from_impls.rs
@@ -23,16 +23,16 @@ impl From<cargo_packager_updater::WindowsUpdateInstallMode> for WindowsUpdateIns
 impl From<cargo_packager_updater::UpdaterWindowsConfig> for UpdaterWindowsOptions {
     fn from(value: cargo_packager_updater::UpdaterWindowsConfig) -> Self {
         Self {
-            installer_args: Some(value.installer_args),
-            install_mode: Some(value.install_mode.into()),
+            installer_args: value.installer_args,
+            install_mode: value.install_mode.map(Into::into),
         }
     }
 }
 impl From<UpdaterWindowsOptions> for cargo_packager_updater::UpdaterWindowsConfig {
     fn from(value: UpdaterWindowsOptions) -> Self {
         Self {
-            installer_args: value.installer_args.unwrap_or_default(),
-            install_mode: value.install_mode.map(Into::into).unwrap_or_default(),
+            installer_args: value.installer_args,
+            install_mode: value.install_mode.map(Into::into),
         }
     }
 }
@@ -46,7 +46,7 @@ impl From<Options> for cargo_packager_updater::Config {
                 .filter_map(|e| e.parse().ok())
                 .collect(),
             pubkey: value.pubkey,
-            windows: value.windows.map(Into::into).unwrap_or_default(),
+            windows: value.windows.map(Into::into),
         }
     }
 }
@@ -99,7 +99,7 @@ impl From<cargo_packager_updater::Update> for Update {
                 })
                 .collect(),
             format: value.format.into(),
-            windows: value.config.windows.into(),
+            windows: value.config.windows.map(Into::into),
         }
     }
 }
diff --git a/bindings/updater/nodejs/src/lib.rs b/bindings/updater/nodejs/src/lib.rs
@@ -124,7 +124,7 @@ pub struct Update {
     /// Update format
     pub format: UpdateFormat,
     /// The Windows options for the updater.
-    pub windows: UpdaterWindowsOptions,
+    pub windows: Option<UpdaterWindowsOptions>,
     /// Update description
     pub body: Option<String>,
     /// Update publish date
@@ -138,7 +138,7 @@ impl Update {
         Ok(cargo_packager_updater::Update {
             config: cargo_packager_updater::Config {
                 pubkey: self.pubkey.clone(),
-                windows: self.windows.clone().into(),
+                windows: self.windows.clone().map(Into::into),
                 ..Default::default()
             },
             body: self.body.clone(),