From cfc2f9adc0e5f0dfc219a3e144f4d488b0bfca58 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Tue, 28 Jun 2016 22:49:13 -0700
Subject: [PATCH] Remove Error from name of Error variants

---
 serde_test/src/de.rs              | 60 +++++++++++++++----------------
 serde_test/src/error.rs           | 28 +++++++--------
 testing/tests/test_annotations.rs | 10 +++---
 testing/tests/test_de.rs          |  6 ++--
 4 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/serde_test/src/de.rs b/serde_test/src/de.rs
index 127dc221..a2d4c3d7 100644
--- a/serde_test/src/de.rs
+++ b/serde_test/src/de.rs
@@ -145,7 +145,7 @@ impl<I> de::Deserializer for Deserializer<I>
                 self.visit_map(len, visitor)
             }
             Some(token) => Err(Error::UnexpectedToken(token)),
-            None => Err(Error::EndOfStreamError),
+            None => Err(Error::EndOfStream),
         }
     }
 
@@ -168,7 +168,7 @@ impl<I> de::Deserializer for Deserializer<I>
                 visitor.visit_none()
             }
             Some(_) => visitor.visit_some(self),
-            None => Err(Error::EndOfStreamError),
+            None => Err(Error::EndOfStream),
         }
     }
 
@@ -198,7 +198,7 @@ impl<I> de::Deserializer for Deserializer<I>
                 let token = self.tokens.next().unwrap();
                 Err(Error::UnexpectedToken(token))
             }
-            None => { return Err(Error::EndOfStreamError); }
+            None => { return Err(Error::EndOfStream); }
         }
     }
 
@@ -215,7 +215,7 @@ impl<I> de::Deserializer for Deserializer<I>
                 }
             }
             Some(_) => self.deserialize(visitor),
-            None => Err(Error::EndOfStreamError),
+            None => Err(Error::EndOfStream),
         }
     }
 
@@ -234,7 +234,7 @@ impl<I> de::Deserializer for Deserializer<I>
                 }
             }
             Some(_) => self.deserialize(visitor),
-            None => Err(Error::EndOfStreamError),
+            None => Err(Error::EndOfStream),
         }
     }
 
@@ -249,7 +249,7 @@ impl<I> de::Deserializer for Deserializer<I>
                 self.visit_array(len, visitor)
             }
             Some(_) => self.deserialize(visitor),
-            None => Err(Error::EndOfStreamError),
+            None => Err(Error::EndOfStream),
         }
     }
 
@@ -284,7 +284,7 @@ impl<I> de::Deserializer for Deserializer<I>
                 self.visit_tuple_struct(len, visitor)
             }
             Some(_) => self.deserialize(visitor),
-            None => Err(Error::EndOfStreamError),
+            None => Err(Error::EndOfStream),
         }
     }
 
@@ -328,7 +328,7 @@ impl<I> de::Deserializer for Deserializer<I>
                 }
             }
             Some(_) => self.deserialize(visitor),
-            None => Err(Error::EndOfStreamError),
+            None => Err(Error::EndOfStream),
         }
     }
 
@@ -352,7 +352,7 @@ impl<I> de::Deserializer for Deserializer<I>
                 self.visit_map(Some(fields.len()), visitor)
             }
             Some(_) => self.deserialize(visitor),
-            None => Err(Error::EndOfStreamError),
+            None => Err(Error::EndOfStream),
         }
     }
 }
@@ -383,7 +383,7 @@ impl<'a, I> SeqVisitor for DeserializerSeqVisitor<'a, I>
                 let token = self.de.tokens.next().unwrap();
                 Err(Error::UnexpectedToken(token))
             }
-            None => Err(Error::EndOfStreamError),
+            None => Err(Error::EndOfStream),
         }
     }
 
@@ -392,7 +392,7 @@ impl<'a, I> SeqVisitor for DeserializerSeqVisitor<'a, I>
         match self.de.tokens.next() {
             Some(Token::SeqEnd) => Ok(()),
             Some(token) => Err(Error::UnexpectedToken(token)),
-            None => Err(Error::EndOfStreamError),
+            None => Err(Error::EndOfStream),
         }
     }
 
@@ -428,7 +428,7 @@ impl<'a, I> SeqVisitor for DeserializerArrayVisitor<'a, I>
                 let token = self.de.tokens.next().unwrap();
                 Err(Error::UnexpectedToken(token))
             }
-            None => Err(Error::EndOfStreamError),
+            None => Err(Error::EndOfStream),
         }
     }
 
@@ -437,7 +437,7 @@ impl<'a, I> SeqVisitor for DeserializerArrayVisitor<'a, I>
         match self.de.tokens.next() {
             Some(Token::SeqEnd) => Ok(()),
             Some(token) => Err(Error::UnexpectedToken(token)),
-            None => Err(Error::EndOfStreamError),
+            None => Err(Error::EndOfStream),
         }
     }
 
@@ -472,7 +472,7 @@ impl<'a, I> SeqVisitor for DeserializerTupleVisitor<'a, I>
                 let token = self.de.tokens.next().unwrap();
                 Err(Error::UnexpectedToken(token))
             }
-            None => Err(Error::EndOfStreamError),
+            None => Err(Error::EndOfStream),
         }
     }
 
@@ -481,7 +481,7 @@ impl<'a, I> SeqVisitor for DeserializerTupleVisitor<'a, I>
         match self.de.tokens.next() {
             Some(Token::TupleEnd) => Ok(()),
             Some(token) => Err(Error::UnexpectedToken(token)),
-            None => Err(Error::EndOfStreamError),
+            None => Err(Error::EndOfStream),
         }
     }
 
@@ -516,7 +516,7 @@ impl<'a, I> SeqVisitor for DeserializerTupleStructVisitor<'a, I>
                 let token = self.de.tokens.next().unwrap();
                 Err(Error::UnexpectedToken(token))
             }
-            None => Err(Error::EndOfStreamError),
+            None => Err(Error::EndOfStream),
         }
     }
 
@@ -525,7 +525,7 @@ impl<'a, I> SeqVisitor for DeserializerTupleStructVisitor<'a, I>
         match self.de.tokens.next() {
             Some(Token::TupleStructEnd) => Ok(()),
             Some(token) => Err(Error::UnexpectedToken(token)),
-            None => Err(Error::EndOfStreamError),
+            None => Err(Error::EndOfStream),
         }
     }
 
@@ -560,7 +560,7 @@ impl<'a, I> SeqVisitor for DeserializerVariantSeqVisitor<'a, I>
                 let token = self.de.tokens.next().unwrap();
                 Err(Error::UnexpectedToken(token))
             }
-            None => Err(Error::EndOfStreamError),
+            None => Err(Error::EndOfStream),
         }
     }
 
@@ -569,7 +569,7 @@ impl<'a, I> SeqVisitor for DeserializerVariantSeqVisitor<'a, I>
         match self.de.tokens.next() {
             Some(Token::EnumSeqEnd) => Ok(()),
             Some(token) => Err(Error::UnexpectedToken(token)),
-            None => Err(Error::EndOfStreamError),
+            None => Err(Error::EndOfStream),
         }
     }
 
@@ -605,7 +605,7 @@ impl<'a, I> MapVisitor for DeserializerMapVisitor<'a, I>
                 let token = self.de.tokens.next().unwrap();
                 Err(Error::UnexpectedToken(token))
             }
-            None => Err(Error::EndOfStreamError),
+            None => Err(Error::EndOfStream),
         }
     }
 
@@ -620,7 +620,7 @@ impl<'a, I> MapVisitor for DeserializerMapVisitor<'a, I>
         match self.de.tokens.next() {
             Some(Token::MapEnd) => Ok(()),
             Some(token) => Err(Error::UnexpectedToken(token)),
-            None => Err(Error::EndOfStreamError),
+            None => Err(Error::EndOfStream),
         }
     }
 
@@ -656,7 +656,7 @@ impl<'a, I> MapVisitor for DeserializerStructVisitor<'a, I>
                 let token = self.de.tokens.next().unwrap();
                 Err(Error::UnexpectedToken(token))
             }
-            None => Err(Error::EndOfStreamError),
+            None => Err(Error::EndOfStream),
         }
     }
 
@@ -671,7 +671,7 @@ impl<'a, I> MapVisitor for DeserializerStructVisitor<'a, I>
         match self.de.tokens.next() {
             Some(Token::StructEnd) => Ok(()),
             Some(token) => Err(Error::UnexpectedToken(token)),
-            None => Err(Error::EndOfStreamError),
+            None => Err(Error::EndOfStream),
         }
     }
 
@@ -707,7 +707,7 @@ impl<'a, I> VariantVisitor for DeserializerVariantVisitor<'a, I>
             Some(_) => {
                 Deserialize::deserialize(self.de)
             }
-            None => Err(Error::EndOfStreamError),
+            None => Err(Error::EndOfStream),
         }
     }
 
@@ -720,7 +720,7 @@ impl<'a, I> VariantVisitor for DeserializerVariantVisitor<'a, I>
             Some(_) => {
                 Deserialize::deserialize(self.de)
             }
-            None => Err(Error::EndOfStreamError),
+            None => Err(Error::EndOfStream),
         }
     }
 
@@ -735,7 +735,7 @@ impl<'a, I> VariantVisitor for DeserializerVariantVisitor<'a, I>
             Some(_) => {
                 Deserialize::deserialize(self.de)
             }
-            None => Err(Error::EndOfStreamError),
+            None => Err(Error::EndOfStream),
         }
     }
 
@@ -766,7 +766,7 @@ impl<'a, I> VariantVisitor for DeserializerVariantVisitor<'a, I>
             Some(_) => {
                 Deserialize::deserialize(self.de)
             }
-            None => Err(Error::EndOfStreamError),
+            None => Err(Error::EndOfStream),
         }
     }
 
@@ -797,7 +797,7 @@ impl<'a, I> VariantVisitor for DeserializerVariantVisitor<'a, I>
             Some(_) => {
                 Deserialize::deserialize(self.de)
             }
-            None => Err(Error::EndOfStreamError),
+            None => Err(Error::EndOfStream),
         }
     }
 }
@@ -828,7 +828,7 @@ impl<'a, I> MapVisitor for DeserializerVariantMapVisitor<'a, I>
                 let token = self.de.tokens.next().unwrap();
                 Err(Error::UnexpectedToken(token))
             }
-            None => Err(Error::EndOfStreamError),
+            None => Err(Error::EndOfStream),
         }
     }
 
@@ -843,7 +843,7 @@ impl<'a, I> MapVisitor for DeserializerVariantMapVisitor<'a, I>
         match self.de.tokens.next() {
             Some(Token::EnumMapEnd) => Ok(()),
             Some(token) => Err(Error::UnexpectedToken(token)),
-            None => Err(Error::EndOfStreamError),
+            None => Err(Error::EndOfStream),
         }
     }
 
diff --git a/serde_test/src/error.rs b/serde_test/src/error.rs
index cc429f97..a575b503 100644
--- a/serde_test/src/error.rs
+++ b/serde_test/src/error.rs
@@ -6,21 +6,21 @@ use token::Token;
 
 #[derive(Clone, PartialEq, Debug)]
 pub enum Error {
-    CustomError(String),
-    EndOfStreamError,
-    UnknownFieldError(String),
-    UnknownVariantError(String),
-    MissingFieldError(&'static str),
-    DuplicateFieldError(&'static str),
+    Custom(String),
+    EndOfStream,
+    UnknownField(String),
+    UnknownVariant(String),
+    MissingField(&'static str),
+    DuplicateField(&'static str),
     InvalidName(&'static str),
     InvalidValue(String),
     UnexpectedToken(Token<'static>),
-    ValueError(de::value::Error),
+    Value(de::value::Error),
 }
 
 impl ser::Error for Error {
     fn custom<T: Into<String>>(msg: T) -> Error {
-        Error::CustomError(msg.into())
+        Error::Custom(msg.into())
     }
 
     fn invalid_value(msg: &str) -> Error {
@@ -30,11 +30,11 @@ impl ser::Error for Error {
 
 impl de::Error for Error {
     fn custom<T: Into<String>>(msg: T) -> Error {
-        Error::CustomError(msg.into())
+        Error::Custom(msg.into())
     }
 
     fn end_of_stream() -> Error {
-        Error::EndOfStreamError
+        Error::EndOfStream
     }
 
     fn invalid_value(msg: &str) -> Error {
@@ -42,19 +42,19 @@ impl de::Error for Error {
     }
 
     fn unknown_field(field: &str) -> Error {
-        Error::UnknownFieldError(field.to_owned())
+        Error::UnknownField(field.to_owned())
     }
 
     fn unknown_variant(variant: &str) -> Error {
-        Error::UnknownVariantError(variant.to_owned())
+        Error::UnknownVariant(variant.to_owned())
     }
 
     fn missing_field(field: &'static str) -> Error {
-        Error::MissingFieldError(field)
+        Error::MissingField(field)
     }
 
     fn duplicate_field(field: &'static str) -> Error {
-        Error::DuplicateFieldError(field)
+        Error::DuplicateField(field)
     }
 }
 
diff --git a/testing/tests/test_annotations.rs b/testing/tests/test_annotations.rs
index bb1564cd..245f0a22 100644
--- a/testing/tests/test_annotations.rs
+++ b/testing/tests/test_annotations.rs
@@ -343,7 +343,7 @@ fn test_ignore_unknown() {
             Token::StructSep,
             Token::Str("whoops"),
         ],
-        Error::UnknownFieldError("whoops".to_owned())
+        Error::UnknownField("whoops".to_owned())
     );
 }
 
@@ -905,7 +905,7 @@ fn test_missing_renamed_field_struct() {
 
             Token::StructEnd,
         ],
-        Error::MissingFieldError("a3"),
+        Error::MissingField("a3"),
     );
 
     assert_de_tokens_error::<RenameStructSerializeDeserialize>(
@@ -918,7 +918,7 @@ fn test_missing_renamed_field_struct() {
 
             Token::StructEnd,
         ],
-        Error::MissingFieldError("a5"),
+        Error::MissingField("a5"),
     );
 }
 
@@ -930,7 +930,7 @@ fn test_missing_renamed_field_enum() {
 
             Token::EnumMapEnd,
         ],
-        Error::MissingFieldError("b"),
+        Error::MissingField("b"),
     );
 
     assert_de_tokens_error::<RenameEnumSerializeDeserialize<i8>>(
@@ -943,6 +943,6 @@ fn test_missing_renamed_field_enum() {
 
             Token::EnumMapEnd,
         ],
-        Error::MissingFieldError("d"),
+        Error::MissingField("d"),
     );
 }
diff --git a/testing/tests/test_de.rs b/testing/tests/test_de.rs
index 85f515cd..3212e74c 100644
--- a/testing/tests/test_de.rs
+++ b/testing/tests/test_de.rs
@@ -778,7 +778,7 @@ declare_error_tests! {
         vec![
             Token::EnumUnit("Enum", "Foo"),
         ],
-        Error::UnknownVariantError("Foo".to_owned()),
+        Error::UnknownVariant("Foo".to_owned()),
     }
     test_struct_seq_too_long<Struct> {
         vec![
@@ -799,7 +799,7 @@ declare_error_tests! {
                 Token::MapSep,
                 Token::Str("a"),
         ],
-        Error::DuplicateFieldError("a"),
+        Error::DuplicateField("a"),
     }
     test_duplicate_field_enum<Enum> {
         vec![
@@ -811,6 +811,6 @@ declare_error_tests! {
                 Token::EnumMapSep,
                 Token::Str("a"),
         ],
-        Error::DuplicateFieldError("a"),
+        Error::DuplicateField("a"),
     }
 }