Extension - Update to latest arma-rs (#10312)

extension/Cargo.toml

@@ -8,7 +8,7 @@ name = "ace"
 crate-type = ["cdylib"]
 
 [dependencies]
-arma-rs = { version = "1.10.5", features = ["uuid"] }
+arma-rs = { version = "1.11.0", default-features = false, features = ["extension", "uuid"]}
 uuid = { version = "1.10.0", features = ["v4"] }
 rand = "0.8.5"
 rand_chacha = "0.3.1"

extension/src/ballistics/atmosphere.rs

@@ -1,4 +1,4 @@
-use arma_rs::FromArma;
+use arma_rs::{FromArma, FromArmaError};
 
 use super::map::Map;
 use crate::common::Temperature;
@@ -10,12 +10,12 @@ pub enum AtmosphereModel {
 }
 
 impl FromArma for AtmosphereModel {
-    fn from_arma(s: String) -> Result<Self, String> {
+    fn from_arma(s: String) -> Result<Self, FromArmaError> {
         let s = s.trim_matches('"');
         match s.to_lowercase().as_str() {
             "icao" => Ok(Self::Icao),
             "asm" => Ok(Self::Asm),
-            _ => Err(String::from("unexpected model")),
+            _ => Err(FromArmaError::InvalidValue("unexpected model".into())),
         }
     }
 }

extension/src/ballistics/drag.rs

@@ -1,6 +1,6 @@
 #![allow(clippy::approx_constant)]
 
-use arma_rs::FromArma;
+use arma_rs::{FromArma, FromArmaError};
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum DragFunction {
@@ -13,15 +13,17 @@ pub enum DragFunction {
 }
 
 impl FromArma for DragFunction {
-    fn from_arma(s: String) -> Result<Self, String> {
+    fn from_arma(s: String) -> Result<Self, FromArmaError> {
         match s.as_str() {
             "1" => Ok(Self::G1),
             "2" => Ok(Self::G2),
             "5" => Ok(Self::G5),
             "6" => Ok(Self::G6),
             "7" => Ok(Self::G7),
             "8" => Ok(Self::G8),
-            _ => Err(format!("Unknown drag function: {s}")),
+            _ => Err(FromArmaError::InvalidValue(format!(
+                "Unknown drag function: {s}"
+            ))),
         }
     }
 }

extension/src/common/types/height.rs

@@ -1,6 +1,6 @@
 use std::ops::Deref;
 
-use arma_rs::FromArma;
+use arma_rs::{FromArma, FromArmaError};
 
 #[derive(Debug, Clone, Copy)]
 /// Height in meters
@@ -13,8 +13,10 @@ impl Height {
 }
 
 impl FromArma for Height {
-    fn from_arma(value: String) -> Result<Self, String> {
-        Ok(Self(value.parse::<f64>().map_err(|_| "Invalid height")?))
+    fn from_arma(value: String) -> Result<Self, FromArmaError> {
+        Ok(Self(value.parse::<f64>().map_err(|_| {
+            FromArmaError::InvalidValue("Invalid height".into())
+        })?))
     }
 }
 

extension/src/common/types/muzzle_velocity.rs

@@ -1,6 +1,6 @@
 use std::ops::Deref;
 
-use arma_rs::FromArma;
+use arma_rs::{FromArma, FromArmaError};
 
 #[derive(Debug, Clone, Copy)]
 /// Muzzle velocity in m/s
@@ -14,12 +14,10 @@ impl MuzzleVelocity {
 }
 
 impl FromArma for MuzzleVelocity {
-    fn from_arma(value: String) -> Result<Self, String> {
-        Ok(Self(
-            value
-                .parse::<f64>()
-                .map_err(|_| "Invalid muzzle velocity")?,
-        ))
+    fn from_arma(value: String) -> Result<Self, FromArmaError> {
+        Ok(Self(value.parse::<f64>().map_err(|_| {
+            FromArmaError::InvalidValue("Invalid muzzle velocity".into())
+        })?))
     }
 }
 

extension/src/common/types/temperature.rs

@@ -1,4 +1,4 @@
-use arma_rs::FromArma;
+use arma_rs::{FromArma, FromArmaError};
 
 #[derive(Debug, Clone, Copy, PartialEq)]
 pub struct Temperature(f64);
@@ -35,25 +35,35 @@ impl Temperature {
 }
 
 impl FromArma for Temperature {
-    fn from_arma(s: String) -> Result<Self, String> {
+    fn from_arma(s: String) -> Result<Self, FromArmaError> {
         if s.is_empty() {
-            return Err(String::from("unexpected empty string"));
+            return Err(FromArmaError::InvalidValue(
+                "unexpected empty string".into(),
+            ));
         }
         match s.chars().next().unwrap() {
             'c' => {
-                let temp = s[1..].parse::<f64>().map_err(|e| format!("{e}"))?;
+                let temp = s[1..]
+                    .parse::<f64>()
+                    .map_err(|e| FromArmaError::InvalidValue(format!("{e}")))?;
                 Ok(Self::new_celsius(temp))
             }
             'f' => {
-                let temp = s[1..].parse::<f64>().map_err(|e| format!("{e}"))?;
+                let temp = s[1..]
+                    .parse::<f64>()
+                    .map_err(|e| FromArmaError::InvalidValue(format!("{e}")))?;
                 Ok(Self::new_fahrenheit(temp))
             }
             'k' => {
-                let temp = s[1..].parse::<f64>().map_err(|e| format!("{e}"))?;
+                let temp = s[1..]
+                    .parse::<f64>()
+                    .map_err(|e| FromArmaError::InvalidValue(format!("{e}")))?;
                 Ok(Self::new_kelvin(temp))
             }
             _ => {
-                let temp = s.parse::<f64>().map_err(|e| format!("{e}"))?;
+                let temp = s
+                    .parse::<f64>()
+                    .map_err(|e| FromArmaError::InvalidValue(format!("{e}")))?;
                 Ok(Self::new_celsius(temp))
             }
         }

extension/src/common/types/vector3.rs

@@ -1,4 +1,4 @@
-use arma_rs::{FromArma, IntoArma};
+use arma_rs::{FromArma, FromArmaError, IntoArma};
 
 #[derive(Debug, Clone, Copy, PartialEq, Default)]
 pub struct Vector3 {
@@ -52,7 +52,7 @@ impl Vector3 {
 }
 
 impl FromArma for Vector3 {
-    fn from_arma(s: String) -> Result<Self, String> {
+    fn from_arma(s: String) -> Result<Self, FromArmaError> {
         let data = <[f64; 3]>::from_arma(s)?;
         Ok(Self {
             x: data[0],