Merge pull request #208 from iancormac84/undeprecate

Remove deprecated uses of Error::description.

Author: kvark

src/de/error.rs

@@ -62,7 +62,7 @@ impl fmt::Display for Error {
         match *self {
             Error::IoError(ref s) => write!(f, "{}", s),
             Error::Message(ref s) => write!(f, "{}", s),
-            Error::Parser(_, pos) => write!(f, "{}: {}", pos, self.description()),
+            Error::Parser(_, pos) => write!(f, "{}: {}", pos, self),
         }
     }
 }
@@ -73,56 +73,7 @@ impl de::Error for Error {
     }
 }
 
-impl StdError for Error {
-    fn description(&self) -> &str {
-        match *self {
-            Error::IoError(ref s) => s,
-            Error::Message(ref e) => e,
-            Error::Parser(ref kind, _) => match *kind {
-                ParseError::Base64Error(ref e) => e.description(),
-                ParseError::Eof => "Unexpected end of file",
-                ParseError::ExpectedArray => "Expected array",
-                ParseError::ExpectedArrayEnd => "Expected end of array",
-                ParseError::ExpectedAttribute => "Expected an enable attribute",
-                ParseError::ExpectedAttributeEnd => {
-                    "Expected closing `)` and `]` after the attribute"
-                }
-                ParseError::ExpectedBoolean => "Expected boolean",
-                ParseError::ExpectedComma => "Expected comma",
-                ParseError::ExpectedEnum => "Expected enum",
-                ParseError::ExpectedChar => "Expected char",
-                ParseError::ExpectedFloat => "Expected float",
-                ParseError::ExpectedInteger => "Expected integer",
-                ParseError::ExpectedOption => "Expected option",
-                ParseError::ExpectedOptionEnd => "Expected end of option",
-                ParseError::ExpectedMap => "Expected map",
-                ParseError::ExpectedMapColon => "Expected colon",
-                ParseError::ExpectedMapEnd => "Expected end of map",
-                ParseError::ExpectedStruct => "Expected struct",
-                ParseError::ExpectedStructEnd => "Expected end of struct",
-                ParseError::ExpectedUnit => "Expected unit",
-                ParseError::ExpectedStructName => "Expected struct name",
-                ParseError::ExpectedString => "Expected string",
-                ParseError::ExpectedStringEnd => "Expected string end",
-                ParseError::ExpectedIdentifier => "Expected identifier",
-
-                ParseError::InvalidEscape(_) => "Invalid escape sequence",
-
-                ParseError::IntegerOutOfBounds => "Integer is out of bounds",
-
-                ParseError::NoSuchExtension(_) => "No such RON extension",
-
-                ParseError::Utf8Error(ref e) => e.description(),
-                ParseError::UnclosedBlockComment => "Unclosed block comment",
-                ParseError::UnderscoreAtBeginning => "Found underscore at the beginning",
-                ParseError::UnexpectedByte(_) => "Unexpected byte",
-                ParseError::TrailingCharacters => "Non-whitespace trailing characters",
-
-                ParseError::__NonExhaustive => unimplemented!(),
-            },
-        }
-    }
-}
+impl StdError for Error {}
 
 impl From<Utf8Error> for ParseError {
     fn from(e: Utf8Error) -> Self {
@@ -144,6 +95,6 @@ impl From<Utf8Error> for Error {
 
 impl From<io::Error> for Error {
     fn from(e: io::Error) -> Self {
-        Error::IoError(e.description().to_string())
+        Error::IoError(e.to_string())
     }
 }