From 6caf8a007499928991203be0c0a4dfe1156ae216 Mon Sep 17 00:00:00 2001
From: Erick Tryzelaar <erick.tryzelaar@gmail.com>
Date: Tue, 23 Feb 2016 08:54:24 -0800
Subject: [PATCH] fix(error): Report `UnknownVariant` and `InvalidValue`

Don't unify it with syntax errors.
---
 serde/src/de/mod.rs   | 10 +++++-----
 serde/src/de/value.rs | 10 ++++++++++
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/serde/src/de/mod.rs b/serde/src/de/mod.rs
index d45930e4..21212f52 100644
--- a/serde/src/de/mod.rs
+++ b/serde/src/de/mod.rs
@@ -32,16 +32,16 @@ pub trait Error: Sized + error::Error {
     /// Raised when a `Deserialize` type unexpectedly hit the end of the stream.
     fn end_of_stream() -> Self;
 
-    /// Raised when a `Deserialize` struct type received an unexpected struct field.
-    fn unknown_field(field: &str) -> Self {
-        Error::syntax(&format!("Unknown field `{}`", field))
-    }
-
     /// Raised when a `Deserialize` enum type received an unexpected variant.
     fn unknown_variant(field: &str) -> Self {
         Error::syntax(&format!("Unknown variant `{}`", field))
     }
 
+    /// Raised when a `Deserialize` struct type received an unexpected struct field.
+    fn unknown_field(field: &str) -> Self {
+        Error::syntax(&format!("Unknown field `{}`", field))
+    }
+
     /// raised when a `deserialize` struct type did not receive a field.
     fn missing_field(field: &'static str) -> Self {
         Error::syntax(&format!("Missing field `{}`", field))
diff --git a/serde/src/de/value.rs b/serde/src/de/value.rs
index 3f40f39e..3d084ba1 100644
--- a/serde/src/de/value.rs
+++ b/serde/src/de/value.rs
@@ -33,9 +33,15 @@ pub enum Error {
     /// The value had an invalid length.
     Length(usize),
 
+    /// The value is invalid and cannot be deserialized.
+    Value(String),
+
     /// EOF while deserializing a value.
     EndOfStream,
 
+    /// Unknown variant in enum.
+    UnknownVariant(String),
+
     /// Unknown field in struct.
     UnknownField(String),
 
@@ -47,7 +53,9 @@ impl de::Error for Error {
     fn syntax(msg: &str) -> Self { Error::Syntax(String::from(msg)) }
     fn type_mismatch(type_: de::Type) -> Self { Error::Type(type_) }
     fn length_mismatch(len: usize) -> Self { Error::Length(len) }
+    fn invalid_value(msg: &str) -> Self { Error::Value(msg.to_owned()) }
     fn end_of_stream() -> Self { Error::EndOfStream }
+    fn unknown_variant(variant: &str) -> Self { Error::UnknownVariant(String::from(variant)) }
     fn unknown_field(field: &str) -> Self { Error::UnknownField(String::from(field)) }
     fn missing_field(field: &'static str) -> Self { Error::MissingField(field) }
 }
@@ -58,7 +66,9 @@ impl fmt::Display for Error {
             Error::Syntax(ref s) => write!(formatter, "Syntax error: {}", s),
             Error::Type(ty) => write!(formatter, "Invalid type: {:?}", ty),
             Error::Length(len) => write!(formatter, "Invalid length: {}", len),
+            Error::Value(ref value) => write!(formatter, "Invalid value: {}", value),
             Error::EndOfStream => formatter.write_str("EndOfStreamError"),
+            Error::UnknownVariant(ref variant) => write!(formatter, "Unknown varian: {}", variant),
             Error::UnknownField(ref field) => write!(formatter, "Unknown field: {}", field),
             Error::MissingField(ref field) => write!(formatter, "Missing field: {}", field),
         }