Skip to content

Commit

Permalink
Rollup merge of rust-lang#88216 - kornelski:from_layout_err, r=kennytm
Browse files Browse the repository at this point in the history
Don't stabilize creation of TryReserveError instances

rust-lang#48043 + rust-lang#87993 (comment)
  • Loading branch information
GuillaumeGomez authored Aug 26, 2021
2 parents b0d21ba + f1e8607 commit b937bd4
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions library/alloc/src/collections/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

Expand Down

0 comments on commit b937bd4

Please sign in to comment.