Skip to content

Commit b937bd4

Browse files
Rollup merge of rust-lang#88216 - kornelski:from_layout_err, r=kennytm
Don't stabilize creation of TryReserveError instances rust-lang#48043 + rust-lang#87993 (comment)
2 parents b0d21ba + f1e8607 commit b937bd4

File tree

1 file changed

+3
-3
lines changed
  • library/alloc/src/collections

1 file changed

+3
-3
lines changed

library/alloc/src/collections/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -117,12 +117,12 @@ impl From<TryReserveErrorKind> for TryReserveError {
117117
}
118118
}
119119

120-
#[unstable(feature = "try_reserve", reason = "new API", issue = "48043")]
121-
impl From<LayoutError> for TryReserveError {
120+
#[unstable(feature = "try_reserve_kind", reason = "new API", issue = "48043")]
121+
impl From<LayoutError> for TryReserveErrorKind {
122122
/// Always evaluates to [`TryReserveErrorKind::CapacityOverflow`].
123123
#[inline]
124124
fn from(_: LayoutError) -> Self {
125-
TryReserveErrorKind::CapacityOverflow.into()
125+
TryReserveErrorKind::CapacityOverflow
126126
}
127127
}
128128

0 commit comments

Comments
 (0)