diff options
| author | bors <bors@rust-lang.org> | 2020-03-12 16:20:52 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-03-12 16:20:52 +0000 |
| commit | 54b7d21f59a363e53eb1c31d76b40af2ff99321c (patch) | |
| tree | 927ba9a9388c1384392cd56cfbde1f5a74eb935c /src/libstd | |
| parent | 23de8275c9b5e5812dc54a12bdba6d80870d9dc8 (diff) | |
| parent | 9463cf3361d14d435263c3d3cd651c985cbbc485 (diff) | |
Auto merge of #69950 - Centril:rollup-xh0hmvx, r=Centril
Rollup of 10 pull requests Successful merges: - #68899 (Add Display and Error impls for proc_macro::LexError) - #69011 (Document unsafe blocks in core::fmt) - #69674 (Rename DefKind::Method and TraitItemKind::Method ) - #69705 (Toolstate: remove redundant beta-week check.) - #69722 (Tweak output for invalid negative impl AST errors) - #69747 (Rename rustc guide) - #69792 (Implement Error for TryReserveError) - #69830 (miri: ICE on invalid terminators) - #69921 (rustdoc: remove unused import) - #69945 (update outdated comment) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/error.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libstd/error.rs b/src/libstd/error.rs index 3f6501bc7b4..2a370f19296 100644 --- a/src/libstd/error.rs +++ b/src/libstd/error.rs @@ -552,6 +552,9 @@ impl Error for char::ParseCharError { } } +#[unstable(feature = "try_reserve", reason = "new API", issue = "48043")] +impl Error for alloc::collections::TryReserveError {} + // Copied from `any.rs`. impl dyn Error + 'static { /// Returns `true` if the boxed type is the same as `T` |
