From 145f3acfc055683fa4f6f849b0e5c0851f3b84e6 Mon Sep 17 00:00:00 2001 From: Yerkebulan Tulibergenov Date: Sun, 3 Feb 2019 16:36:49 -0800 Subject: [PATCH 1/3] description function in error trait is deprecated --- src/error/multiple_error_types/wrap_error.md | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/error/multiple_error_types/wrap_error.md b/src/error/multiple_error_types/wrap_error.md index 15c0d662a0..be1ea35311 100644 --- a/src/error/multiple_error_types/wrap_error.md +++ b/src/error/multiple_error_types/wrap_error.md @@ -29,14 +29,6 @@ impl fmt::Display for DoubleError { } impl error::Error for DoubleError { - fn description(&self) -> &str { - match *self { - DoubleError::EmptyVec => "empty vectors not allowed", - // This already impls `Error`, so defer to its own implementation. - DoubleError::Parse(ref e) => e.description(), - } - } - fn cause(&self) -> Option<&error::Error> { match *self { DoubleError::EmptyVec => None, From 01d08e35a1cafb2fda1ed80841b563d9ede888ac Mon Sep 17 00:00:00 2001 From: Yerkebulan Tulibergenov Date: Sun, 3 Feb 2019 16:37:21 -0800 Subject: [PATCH 2/3] cause fn is deprecated in favor of source --- src/error/multiple_error_types/wrap_error.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/error/multiple_error_types/wrap_error.md b/src/error/multiple_error_types/wrap_error.md index be1ea35311..f384c0c247 100644 --- a/src/error/multiple_error_types/wrap_error.md +++ b/src/error/multiple_error_types/wrap_error.md @@ -29,7 +29,7 @@ impl fmt::Display for DoubleError { } impl error::Error for DoubleError { - fn cause(&self) -> Option<&error::Error> { + fn source(&self) -> Option<&(dyn error::Error + 'static)> { match *self { DoubleError::EmptyVec => None, // The cause is the underlying implementation error type. Is implicitly From 9143868bb61111aebe4751d2fb1ec27ddd23b4fc Mon Sep 17 00:00:00 2001 From: Yerkebulan Tulibergenov Date: Sun, 3 Feb 2019 16:40:00 -0800 Subject: [PATCH 3/3] remove description and replace cause with source in define_error_type.md --- src/error/multiple_error_types/define_error_type.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/error/multiple_error_types/define_error_type.md b/src/error/multiple_error_types/define_error_type.md index b7187d0d01..45e5766690 100644 --- a/src/error/multiple_error_types/define_error_type.md +++ b/src/error/multiple_error_types/define_error_type.md @@ -40,11 +40,7 @@ impl fmt::Display for DoubleError { // This is important for other errors to wrap this one. impl error::Error for DoubleError { - fn description(&self) -> &str { - "invalid first item to double" - } - - fn cause(&self) -> Option<&error::Error> { + fn source(&self) -> Option<&(dyn error::Error + 'static)> { // Generic error, underlying cause isn't tracked. None }