diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2021-08-26 12:38:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-26 12:38:08 -0700 |
| commit | cf5e362fd5d228e172ba8765ab0127448aaee832 (patch) | |
| tree | 70659f3d27e50ee5f8d68a86409b9eaf8aaf2340 /library/alloc/src | |
| parent | 14fb87a4092115887346d4ee8a9278ef540680cd (diff) | |
| parent | f1e860757e9494c82450c100a9ce5240858b537b (diff) | |
| download | rust-cf5e362fd5d228e172ba8765ab0127448aaee832.tar.gz rust-cf5e362fd5d228e172ba8765ab0127448aaee832.zip | |
Rollup merge of #88216 - kornelski:from_layout_err, r=kennytm
Don't stabilize creation of TryReserveError instances #48043 + https://github.com/rust-lang/rust/pull/87993#issuecomment-903189016
Diffstat (limited to 'library/alloc/src')
| -rw-r--r-- | library/alloc/src/collections/mod.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/library/alloc/src/collections/mod.rs b/library/alloc/src/collections/mod.rs index 0d442011921..4e31df8b4b8 100644 --- a/library/alloc/src/collections/mod.rs +++ b/library/alloc/src/collections/mod.rs @@ -117,12 +117,12 @@ impl From<TryReserveErrorKind> for TryReserveError { } } -#[unstable(feature = "try_reserve", reason = "new API", issue = "48043")] -impl From<LayoutError> for TryReserveError { +#[unstable(feature = "try_reserve_kind", reason = "new API", issue = "48043")] +impl From<LayoutError> for TryReserveErrorKind { /// Always evaluates to [`TryReserveErrorKind::CapacityOverflow`]. #[inline] fn from(_: LayoutError) -> Self { - TryReserveErrorKind::CapacityOverflow.into() + TryReserveErrorKind::CapacityOverflow } } |