diff options
| author | David Tolnay <dtolnay@gmail.com> | 2019-11-30 20:01:48 -0800 |
|---|---|---|
| committer | David Tolnay <dtolnay@gmail.com> | 2019-12-24 22:39:49 -0800 |
| commit | 4646a88b7a1e68326d092b9cbbbbdd616a51077f (patch) | |
| tree | e22c490b7e63a021218a48af92bc08a6483c6a9e /src/libstd/sys_common | |
| parent | c5a2a9a99c3973f77d7c86acb8ff7039c3d9c703 (diff) | |
| download | rust-4646a88b7a1e68326d092b9cbbbbdd616a51077f.tar.gz rust-4646a88b7a1e68326d092b9cbbbbdd616a51077f.zip | |
Deprecate Error::description for real
`description` has been documented as soft-deprecated since 1.27.0 (17 months ago). There is no longer any reason to call it or implement it. This commit: - adds #[rustc_deprecated(since = "1.41.0")] to Error::description; - moves description (and cause, which is also deprecated) below the source and backtrace methods in the Error trait; - reduces documentation of description and cause to take up much less vertical real estate in rustdocs, while preserving the example that shows how to render errors without needing to call description; - removes the description function of all *currently unstable* Error impls in the standard library; - marks #[allow(deprecated)] the description function of all *stable* Error impls in the standard library; - replaces miscellaneous uses of description in example code and the compiler.
Diffstat (limited to 'src/libstd/sys_common')
| -rw-r--r-- | src/libstd/sys_common/poison.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libstd/sys_common/poison.rs b/src/libstd/sys_common/poison.rs index 0157b952996..285851d631a 100644 --- a/src/libstd/sys_common/poison.rs +++ b/src/libstd/sys_common/poison.rs @@ -148,6 +148,7 @@ impl<T> fmt::Display for PoisonError<T> { #[stable(feature = "rust1", since = "1.0.0")] impl<T> Error for PoisonError<T> { + #[allow(deprecated)] fn description(&self) -> &str { "poisoned lock: another task failed inside" } @@ -239,6 +240,7 @@ impl<T> fmt::Display for TryLockError<T> { #[stable(feature = "rust1", since = "1.0.0")] impl<T> Error for TryLockError<T> { + #[allow(deprecated, deprecated_in_future)] fn description(&self) -> &str { match *self { TryLockError::Poisoned(ref p) => p.description(), @@ -246,6 +248,7 @@ impl<T> Error for TryLockError<T> { } } + #[allow(deprecated)] fn cause(&self) -> Option<&dyn Error> { match *self { TryLockError::Poisoned(ref p) => Some(p), |
