diff --git a/actix-http/src/cookie/parse.rs b/actix-http/src/cookie/parse.rs index 8c9d4b64..20aee950 100644 --- a/actix-http/src/cookie/parse.rs +++ b/actix-http/src/cookie/parse.rs @@ -51,11 +51,7 @@ impl From for ParseError { } } -impl Error for ParseError { - fn description(&self) -> &str { - self.as_str() - } -} +impl Error for ParseError {} fn indexes_of(needle: &str, haystack: &str) -> Option<(usize, usize)> { let haystack_start = haystack.as_ptr() as usize; diff --git a/actix-http/src/error.rs b/actix-http/src/error.rs index bb18184d..d252a0bb 100644 --- a/actix-http/src/error.rs +++ b/actix-http/src/error.rs @@ -114,10 +114,6 @@ impl fmt::Debug for Error { } impl std::error::Error for Error { - fn description(&self) -> &str { - "actix-http::Error" - } - fn cause(&self) -> Option<&dyn std::error::Error> { None } @@ -966,7 +962,6 @@ mod tests { use super::*; use http::{Error as HttpError, StatusCode}; use httparse; - use std::error::Error as StdError; use std::io; #[test] @@ -995,7 +990,7 @@ mod tests { #[test] fn test_error_cause() { let orig = io::Error::new(io::ErrorKind::Other, "other"); - let desc = orig.description().to_owned(); + let desc = orig.to_string(); let e = Error::from(orig); assert_eq!(format!("{}", e.as_response_error()), desc); } @@ -1003,7 +998,7 @@ mod tests { #[test] fn test_error_display() { let orig = io::Error::new(io::ErrorKind::Other, "other"); - let desc = orig.description().to_owned(); + let desc = orig.to_string(); let e = Error::from(orig); assert_eq!(format!("{}", e), desc); } @@ -1045,7 +1040,7 @@ mod tests { match ParseError::from($from) { e @ $error => { let desc = format!("{}", e); - assert_eq!(desc, format!("IO error: {}", $from.description())); + assert_eq!(desc, format!("IO error: {}", $from)); } _ => unreachable!("{:?}", $from), }