From f883457334fee8006752256e96171a4b4a428883 Mon Sep 17 00:00:00 2001
From: Nick Hackman <snickhackman@gmail.com>
Date: Tue, 13 Aug 2019 14:13:01 -0400
Subject: Simplified Logic when comparing discriminants

Removed matches that were used to compare Enum variants for equality in
favor of using discriminant from https://doc.rust-lang.org/std/mem/fn.discriminant.html
introduced in Rust 1.21.0
---
 src/de.rs | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'src/de.rs')

diff --git a/src/de.rs b/src/de.rs
index f020ac0..234fa50 100644
--- a/src/de.rs
+++ b/src/de.rs
@@ -8,6 +8,7 @@ use std::borrow::Cow;
 use std::error;
 use std::f64;
 use std::fmt;
+use std::mem::discriminant;
 use std::str;
 use std::vec;
 
@@ -2057,17 +2058,6 @@ impl<'a> E<'a> {
 
 impl<'a> Value<'a> {
     fn same_type(&self, other: &Value<'a>) -> bool {
-        match (&self.e, &other.e) {
-            (&E::String(..), &E::String(..))
-            | (&E::Integer(..), &E::Integer(..))
-            | (&E::Float(..), &E::Float(..))
-            | (&E::Boolean(..), &E::Boolean(..))
-            | (&E::Datetime(..), &E::Datetime(..))
-            | (&E::Array(..), &E::Array(..))
-            | (&E::InlineTable(..), &E::InlineTable(..)) => true,
-            (&E::DottedTable(..), &E::DottedTable(..)) => true,
-
-            _ => false,
-        }
+        discriminant(&self.e) == discriminant(&other.e)
     }
 }
-- 
cgit v1.2.3