From 524f8c05bf784665fd9a699a6a6eff2857b06c66 Mon Sep 17 00:00:00 2001 From: Armin Ronacher Date: Thu, 7 Jun 2018 10:59:10 +0200 Subject: [PATCH] Rename cause() to as_fail() --- src/error.rs | 14 ++++++++++---- src/httpresponse.rs | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/error.rs b/src/error.rs index 52d605379..d08093fb2 100644 --- a/src/error.rs +++ b/src/error.rs @@ -50,13 +50,19 @@ pub struct Error { } impl Error { + /// Deprecated way to reference the underlying response error. + #[deprecated(since = "0.6.0", note = "please use `Error::as_response_error()` instead")] + pub fn cause(&self) -> &ResponseError { + self.cause.as_ref() + } + /// Returns a reference to the underlying cause of this `Error` as `Fail` - pub fn cause(&self) -> &Fail { + pub fn as_fail(&self) -> &Fail { self.cause.as_fail() } /// Returns the reference to the underlying `ResponseError`. - pub fn response_error(&self) -> &ResponseError { + pub fn as_response_error(&self) -> &ResponseError { self.cause.as_ref() } @@ -919,7 +925,7 @@ mod tests { } #[test] - fn test_cause() { + fn test_as_fail() { let orig = io::Error::new(io::ErrorKind::Other, "other"); let desc = orig.description().to_owned(); let e = ParseError::Io(orig); @@ -937,7 +943,7 @@ mod tests { let orig = io::Error::new(io::ErrorKind::Other, "other"); let desc = orig.description().to_owned(); let e = Error::from(orig); - assert_eq!(format!("{}", e.cause()), desc); + assert_eq!(format!("{}", e.as_fail()), desc); } #[test] diff --git a/src/httpresponse.rs b/src/httpresponse.rs index 55cbd2e8d..ce0360272 100644 --- a/src/httpresponse.rs +++ b/src/httpresponse.rs @@ -89,7 +89,7 @@ impl HttpResponse { /// Constructs an error response #[inline] pub fn from_error(error: Error) -> HttpResponse { - let mut resp = error.response_error().error_response(); + let mut resp = error.as_response_error().error_response(); resp.get_mut().error = Some(error); resp }