From 577c1aa87296c86b84af1882aeedd2951539e963 Mon Sep 17 00:00:00 2001
From: Cassandra de la Cruz-Munoz <me@cass-dlcm.dev>
Date: Sun, 31 Dec 2023 12:07:15 -0500
Subject: [PATCH] use custom errors in VmcExtRvc

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

diff --git a/src/lib.rs b/src/lib.rs
index 5625027..9c98080 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -826,9 +826,9 @@ impl MessageBehavior for VmcExtRvc {
             args,
         };
     }
-    fn from_osc_message(msg: OscMessage) -> Result<Self, String> {
+    fn from_osc_message(msg: OscMessage) -> Result<Self, FromMessageErr> {
         if msg.args.len() < 2 || msg.args.len() > 3 {
-            return Err(String::from("arg count invalid"));
+            return Err(FromMessageErr::ArgCount(ArgCountErr { expected_in: vec![2, 3], actual: msg.args.len(), addr: msg.addr}));
         }
         let enable: bool;
         let port: u16;
@@ -840,25 +840,25 @@ impl MessageBehavior for VmcExtRvc {
                 } else if i == 1 {
                     enable = true;
                 } else {
-                    return Err(String::from("arg value invalid"));
+                    return Err(FromMessageErr::IntRange(IntRangeErr { expected_lower: 0, expected_upper: 1, actual: i, addr: msg.addr, arg_count: 0}));
                 }
             }
-            _ => return Err(String::from("arg type invalid")),
+            _ => return Err(FromMessageErr::ArgType(ArgTypeErr { expected: OscType::Int(0), actual: msg.args[0], addr: msg.addr, arg_count: 0})),
         }
         match msg.args[1] {
             OscType::Int(i) => {
                 if i >= 0 && i <= 65535 {
                     port = i as u16;
                 } else {
-                    return Err(String::from("arg value invalid"));
+                    return Err(FromMessageErr::IntRange(IntRangeErr { expected_lower: 0, expected_upper: 65535, actual: i, addr: msg.addr, arg_count: 1}));
                 }
             }
-            _ => return Err(String::from("arg type invalid")),
+            _ => return Err(FromMessageErr::ArgType(ArgTypeErr { expected: OscType::Int(0), actual: msg.args[1], addr: msg.addr, arg_count: 1})),
         }
         if msg.args.len() == 3 {
             match &msg.args[2] {
                 OscType::String(s) => ip_addr = Some(s.to_owned()),
-                _ => return Err(String::from("arg type invalid")),
+            _ => return Err(FromMessageErr::ArgType(ArgTypeErr { expected: OscType::String(String::new()), actual: msg.args[2], addr: msg.addr, arg_count: 2})),
             }
         }
         return Ok(VmcExtRvc {