diff options
| author | bors <bors@rust-lang.org> | 2020-03-09 22:09:51 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-03-09 22:09:51 +0000 |
| commit | b8cedc00407a4c56a3bda1ed605c6fc166655447 (patch) | |
| tree | c6dcbe9711ea6d5a31429a833a3d0c59cbbb2578 /src/libstd/error.rs | |
| parent | b08d07143d2b61777d341f8658281adc0f2ac809 (diff) | |
| parent | 133f659766c60ff7a33288ae6f33b0c272792f57 (diff) | |
| download | rust-b8cedc00407a4c56a3bda1ed605c6fc166655447.tar.gz rust-b8cedc00407a4c56a3bda1ed605c6fc166655447.zip | |
Auto merge of #69854 - pietroalbini:stable-next, r=Centril 1.42.0
[stable] Release 1.42.0 This PR prepares the release artifacts of Rust 1.42.0, and cherry-picks the following PRs: * https://github.com/rust-lang/rust/pull/69754: Update deprecation version to 1.42 for Error::description * https://github.com/rust-lang/rust/pull/69753: Do not ICE when matching an uninhabited enum's field * https://github.com/rust-lang/rust/pull/69522 / https://github.com/rust-lang/rust/pull/69853: error_derive_forbidden_on_non_adt: be more graceful * https://github.com/rust-lang/rust/pull/68598: Fix null synthetic_implementors error In addition, the release notes are updated to include the remaining compatibility notes. r? @Centril
Diffstat (limited to 'src/libstd/error.rs')
| -rw-r--r-- | src/libstd/error.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/error.rs b/src/libstd/error.rs index b480581e21b..3f6501bc7b4 100644 --- a/src/libstd/error.rs +++ b/src/libstd/error.rs @@ -135,7 +135,7 @@ pub trait Error: Debug + Display { /// } /// ``` #[stable(feature = "rust1", since = "1.0.0")] - #[rustc_deprecated(since = "1.41.0", reason = "use the Display impl or to_string()")] + #[rustc_deprecated(since = "1.42.0", reason = "use the Display impl or to_string()")] fn description(&self) -> &str { "description() is deprecated; use Display" } |