From a4b674c3d8ea98161a5c194df5cf2acc2e8e8524 Mon Sep 17 00:00:00 2001
From: Cassandra de la Cruz-Munoz <me@cass-dlcm.dev>
Date: Sun, 31 Dec 2023 11:52:55 -0500
Subject: [PATCH] use custom errors in VmcExtCam

---
 src/lib.rs | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index cafa7b7..07a94c0 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -404,9 +404,9 @@ impl MessageBehavior for VmcExtCam {
             ],
         };
     }
-    fn from_osc_message(msg: OscMessage) -> Result<Self, String> {
+    fn from_osc_message(msg: OscMessage) -> Result<Self, FromMessageErr> {
         if msg.args.len() != 9 {
-            return Err(String::from("arg count invalid"));
+            return Err(FromMessageErr::ArgCount(ArgCountErr { expected_in: vec![9], actual: msg.args.len(), addr: msg.addr}));
         }
         let name: String;
         let mut origin = Vector3::new(0.0, 0.0, 0.0);
@@ -414,39 +414,39 @@ impl MessageBehavior for VmcExtCam {
         let fov: f32;
         match &msg.args[0] {
             OscType::String(s) => name = s.to_owned(),
-            _ => return Err(String::from("arg type invalid")),
+            _ => return Err(FromMessageErr::ArgType(ArgTypeErr { expected: OscType::String(String::new()), actual: msg.args[0], addr: msg.addr, arg_count: 0})),
         }
         match msg.args[1] {
             OscType::Float(f) => origin.x = f,
-            _ => return Err(String::from("arg type invalid")),
+            _ => return Err(FromMessageErr::ArgType(ArgTypeErr { expected: OscType::Float(0.0), actual: msg.args[1], addr: msg.addr, arg_count: 1})),
         }
         match msg.args[2] {
             OscType::Float(f) => origin.y = f,
-            _ => return Err(String::from("arg type invalid")),
+            _ => return Err(FromMessageErr::ArgType(ArgTypeErr { expected: OscType::Float(0.0), actual: msg.args[2], addr: msg.addr, arg_count: 2})),
         }
         match msg.args[3] {
             OscType::Float(f) => origin.z = f,
-            _ => return Err(String::from("arg type invalid")),
+            _ => return Err(FromMessageErr::ArgType(ArgTypeErr { expected: OscType::Float(0.0), actual: msg.args[3], addr: msg.addr, arg_count: 3})),
         }
         match msg.args[4] {
             OscType::Float(f) => quat.x = f,
-            _ => return Err(String::from("arg type invalid")),
+            _ => return Err(FromMessageErr::ArgType(ArgTypeErr { expected: OscType::Float(0.0), actual: msg.args[4], addr: msg.addr, arg_count: 4})),
         }
         match msg.args[5] {
             OscType::Float(f) => quat.y = f,
-            _ => return Err(String::from("arg type invalid")),
+            _ => return Err(FromMessageErr::ArgType(ArgTypeErr { expected: OscType::Float(0.0), actual: msg.args[5], addr: msg.addr, arg_count: 5})),
         }
         match msg.args[6] {
             OscType::Float(f) => quat.z = f,
-            _ => return Err(String::from("arg type invalid")),
+            _ => return Err(FromMessageErr::ArgType(ArgTypeErr { expected: OscType::Float(0.0), actual: msg.args[6], addr: msg.addr, arg_count: 6})),
         }
         match msg.args[7] {
             OscType::Float(f) => quat.w = f,
-            _ => return Err(String::from("arg type invalid")),
+            _ => return Err(FromMessageErr::ArgType(ArgTypeErr { expected: OscType::Float(0.0), actual: msg.args[7], addr: msg.addr, arg_count: 7})),
         }
         match msg.args[8] {
             OscType::Float(f) => fov = f,
-            _ => return Err(String::from("arg type invalid")),
+            _ => return Err(FromMessageErr::ArgType(ArgTypeErr { expected: OscType::Float(0.0), actual: msg.args[8], addr: msg.addr, arg_count: 8})),
         }
         return Ok(VmcExtCam {
             name,