Fix target's OS variant structure

Author: markcda

src/configs/migrate.rs

@@ -66,13 +66,13 @@ fn migrate_target_v3_to_v4(target: &TargetDescriptionV3) -> TargetDescription {
   TargetDescription {
     arch: target.arch.clone(),
     os: match &target.os {
-      OsVariantV3::Android => OsVariant::Android,
-      OsVariantV3::iOS => OsVariant::iOS,
-      OsVariantV3::Linux => OsVariant::Linux,
-      OsVariantV3::UnixLike(_) => OsVariant::UnixLike,
-      OsVariantV3::Windows => OsVariant::Windows,
-      OsVariantV3::macOS => OsVariant::macOS,
-      OsVariantV3::Other(v) => OsVariant::Other(v.clone()),
+      OsVariantV3::Android => OsVariant("android".to_string()),
+      OsVariantV3::iOS => OsVariant("ios".to_string()),
+      OsVariantV3::Linux => OsVariant("linux".to_string()),
+      OsVariantV3::UnixLike(_) => OsVariant("unix".to_string()),
+      OsVariantV3::Windows => OsVariant("windows".to_string()),
+      OsVariantV3::macOS => OsVariant("macos".to_string()),
+      OsVariantV3::Other(v) => OsVariant(v.to_string()),
     },
     os_derivative: target.derivative.clone(),
     os_version: match &target.version {

src/entities/targets.rs

@@ -35,18 +35,8 @@ pub struct TargetDescription {
 ///
 /// Unix-like is related to `BSD` and other POSIX-compatible systems.
 #[derive(Deserialize, Serialize, PartialEq, Clone, Debug)]
-#[serde(rename_all = "snake_case", untagged)]
-pub enum OsVariant {
-  Android,
-  #[allow(non_camel_case_types)]
-  iOS,
-  Linux,
-  UnixLike,
-  Windows,
-  #[allow(non_camel_case_types)]
-  macOS,
-  Other(String),
-}
+#[serde(rename_all = "snake_case")]
+pub struct OsVariant(pub String);
 
 /// OS version specification.
 ///
@@ -69,22 +59,15 @@ pub enum OsVersionSpecification {
 
 impl std::fmt::Display for TargetDescription {
   fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-    let os = match &self.os {
-      OsVariant::Android => "android",
-      OsVariant::iOS => "ios",
-      OsVariant::Linux => "linux",
-      OsVariant::UnixLike => "unix",
-      OsVariant::Windows => "windows",
-      OsVariant::macOS => "macos",
-      OsVariant::Other(other) => other,
-    };
-
     let os_ver = match &self.os_version {
       OsVersionSpecification::No => "any",
       OsVersionSpecification::Weak { version } => &format!("^{}", version),
       OsVersionSpecification::Strong { version } => version,
     };
 
-    f.write_str(&format!("{}/{}@{}@{}", self.arch, os, self.os_derivative, os_ver))
+    f.write_str(&format!(
+      "{}/{}@{}@{}",
+      self.arch, self.os.0, self.os_derivative, os_ver
+    ))
   }
 }

src/tui/add.rs

@@ -812,15 +812,15 @@ impl TargetDescription {
     .prompt()?;
 
     let os_variant = match os {
-      "Android" => OsVariant::Android,
-      "iOS" => OsVariant::iOS,
-      "Linux" => OsVariant::Linux,
-      "Unix-like" => OsVariant::UnixLike,
-      "Windows" => OsVariant::Windows,
-      "macOS" => OsVariant::macOS,
+      "Android" => OsVariant("android".to_string()),
+      "iOS" => OsVariant("ios".to_string()),
+      "Linux" => OsVariant("linux".to_string()),
+      "Unix-like" => OsVariant("unix".to_string()),
+      "Windows" => OsVariant("windows".to_string()),
+      "macOS" => OsVariant("macos".to_string()),
       "Other" => {
         let name = Text::new(i18n::TARGET_OS_OTHER).prompt()?;
-        OsVariant::Other(name)
+        OsVariant(name.to_lowercase())
       }
       _ => unreachable!(),
     };

src/tui/edit.rs

@@ -1120,15 +1120,15 @@ impl TargetDescription {
           .prompt()?;
 
           self.os = match os {
-            "Android" => OsVariant::Android,
-            "iOS" => OsVariant::iOS,
-            "Linux" => OsVariant::Linux,
-            "Unix-like" => OsVariant::UnixLike,
-            "Windows" => OsVariant::Windows,
-            "macOS" => OsVariant::macOS,
+            "Android" => OsVariant("android".to_string()),
+            "iOS" => OsVariant("ios".to_string()),
+            "Linux" => OsVariant("linux".to_string()),
+            "Unix-like" => OsVariant("unix-like".to_string()),
+            "Windows" => OsVariant("windows".to_string()),
+            "macOS" => OsVariant("macos".to_string()),
             "Other" => {
               let name = Text::new(i18n::TARGET_OS_OTHER).prompt()?;
-              OsVariant::Other(name)
+              OsVariant(name.to_lowercase())
             }
             _ => unreachable!(),
           };