Merge pull request #197 from AnderEnder/remove-deprecated-error-descr…

…iption Remove deprecated Error::description
dtolnay · Mar 15, 2020 · e635255 · e635255
2 parents 15189a1 + 13e9e54
commit e635255
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 15 deletions.
diff --git a/src/version.rs b/src/version.rs
@@ -193,13 +193,7 @@ impl fmt::Display for SemVerError {
     }
 }
 
-impl Error for SemVerError {
-    fn description(&self) -> &str {
-        match self {
-            &SemVerError::ParseError(ref m) => m,
-        }
-    }
-}
+impl Error for SemVerError {}
 
 /// A Result type for errors
 pub type Result<T> = result::Result<T, SemVerError>;

diff --git a/src/version_req.rs b/src/version_req.rs
@@ -167,13 +167,7 @@ pub enum ReqParseError {
 
 impl fmt::Display for ReqParseError {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        self.description().fmt(f)
-    }
-}
-
-impl Error for ReqParseError {
-    fn description(&self) -> &str {
-        match self {
+        let msg = match self {
             &InvalidVersionRequirement => "the given version requirement is invalid",
             &OpAlreadySet => {
                 "you have already provided an operation, such as =, ~, or ^; only use one"
@@ -186,10 +180,13 @@ impl Error for ReqParseError {
                 "the given version requirement is not implemented, yet"
             }
             &DeprecatedVersionRequirement(_) => "This requirement is deprecated",
-        }
+        };
+        msg.fmt(f)
     }
 }
 
+impl Error for ReqParseError {}
+
 impl From<String> for ReqParseError {
     fn from(other: String) -> ReqParseError {
         match &*other {