replace all match_variant instances with try_into

the match_variant macro was unclear, unreadable and no longer needed as
we have automaticly derived from implementations for all Variant enum
fields now

1 files changed, 6 insertions, 14 deletions

diff --git a/src/primitive/variant.rs b/src/primitive/variant.rs
index 8a1c777..61e6752 100644
--- a/src/primitive/variant.rs
+++ b/src/primitive/variant.rs
@@ -61,22 +61,14 @@ pub enum Variant {
     i8(i8),
 }
 
-impl From<Variant> for String {
-    fn from(input: Variant) -> Self {
-        match input {
-            Variant::String(value) => value,
-            Variant::ByteArray(value) => value,
-            _ => panic!("unknown variant expected string or bytearray {:?}", input),
-        }
-    }
-}
+impl TryFrom<Variant> for String {
+    type Error = ProtocolError;
 
-impl From<&Variant> for String {
-    fn from(input: &Variant) -> Self {
+    fn try_from(input: Variant) -> Result<Self, Self::Error> {
         match input {
-            Variant::String(value) => value.clone(),
-            Variant::ByteArray(value) => value.clone(),
-            _ => panic!("unknown variant expected string or bytearray {:?}", input),
+            Variant::String(value) => Ok(value),
+            Variant::ByteArray(value) => Ok(value),
+            _ => Err(ProtocolError::UnknownVariant)
         }
     }
 }