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, 3 insertions, 3 deletions

diff --git a/src/message/handshake/clientlogin.rs b/src/message/handshake/clientlogin.rs
index c589810..b619e48 100644
--- a/src/message/handshake/clientlogin.rs
+++ b/src/message/handshake/clientlogin.rs
@@ -21,10 +21,10 @@ impl HandshakeSerialize for ClientLogin {
 }
 
 impl From<VariantMap> for ClientLogin {
-    fn from(input: VariantMap) -> Self {
+    fn from(mut input: VariantMap) -> Self {
         ClientLogin {
-            user: match_variant!(input.get("User").unwrap(), Variant::String),
-            password: match_variant!(input.get("Password").unwrap(), Variant::String),
+            user: input.remove("User").unwrap().try_into().unwrap(),
+            password: input.remove("Password").unwrap().try_into().unwrap(),
         }
     }
 }