diff --git a/src/format/mod.rs b/src/format/mod.rs index 83405d3..1099f18 100644 --- a/src/format/mod.rs +++ b/src/format/mod.rs @@ -318,30 +318,25 @@ enum ParseErrorKind { /// Same to `Result`. pub type ParseResult = Result; -impl ParseError { - fn description(&self) -> &str { - match self.0 { - ParseErrorKind::OutOfRange => "input is out of range", - ParseErrorKind::Impossible => "no possible date and time matching input", - ParseErrorKind::NotEnough => "input is not enough for unique date and time", - ParseErrorKind::Invalid => "input contains invalid characters", - ParseErrorKind::TooShort => "premature end of input", - ParseErrorKind::TooLong => "trailing input", - ParseErrorKind::BadFormat => "bad or unsupported format string", - } - } -} - impl fmt::Display for ParseError { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - self.description().fmt(f) + match self.0 { + ParseErrorKind::OutOfRange => write!(f, "input is out of range"), + ParseErrorKind::Impossible => write!(f, "no possible date and time matching input"), + ParseErrorKind::NotEnough => write!(f, "input is not enough for unique date and time"), + ParseErrorKind::Invalid => write!(f, "input contains invalid characters"), + ParseErrorKind::TooShort => write!(f, "premature end of input"), + ParseErrorKind::TooLong => write!(f, "trailing input"), + ParseErrorKind::BadFormat => write!(f, "bad or unsupported format string"), + } } } #[cfg(any(feature = "std", test))] impl Error for ParseError { + #[allow(deprecated)] fn description(&self) -> &str { - self.description() + "parser error, see to_string() for details" } } diff --git a/src/oldtime.rs b/src/oldtime.rs index bed8136..1cc8a15 100644 --- a/src/oldtime.rs +++ b/src/oldtime.rs @@ -393,22 +393,17 @@ impl fmt::Display for Duration { #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub struct OutOfRangeError(()); -impl OutOfRangeError { - fn description(&self) -> &str { - "Source duration value is out of range for the target type" - } -} - impl fmt::Display for OutOfRangeError { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!(f, "{}", self.description()) + write!(f, "Source duration value is out of range for the target type") } } #[cfg(any(feature = "std", test))] impl Error for OutOfRangeError { + #[allow(deprecated)] fn description(&self) -> &str { - self.description() + "out of range error" } }