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, 6 deletions

diff --git a/src/message/signalproxy/rpccall/passwordchange.rs b/src/message/signalproxy/rpccall/passwordchange.rs
index 38bfc97..b96b926 100644
--- a/src/message/signalproxy/rpccall/passwordchange.rs
+++ b/src/message/signalproxy/rpccall/passwordchange.rs
@@ -38,10 +38,10 @@ impl RpcCallType for ChangePassword {
         Ok((
             size,
             Self {
-                peer: match_variant!(input.remove(0), Variant::PeerPtr),
-                user: match_variant!(input.remove(0), Variant::String),
-                before: match_variant!(input.remove(0), Variant::String),
-                after: match_variant!(input.remove(0), Variant::String),
+                peer: input.remove(0).try_into().unwrap(),
+                user: input.remove(0).try_into().unwrap(),
+                before: input.remove(0).try_into().unwrap(),
+                after: input.remove(0).try_into().unwrap(),
             }
             .into(),
         ))
@@ -79,8 +79,8 @@ impl RpcCallType for PasswordChanged {
         Ok((
             size,
             Self {
-                peer: match_variant!(input.remove(0), Variant::PeerPtr),
-                success: match_variant!(input.remove(0), Variant::bool),
+                peer: input.remove(0).try_into().unwrap(),
+                success: input.remove(0).try_into().unwrap(),
             }
             .into(),
         ))