Skip to content

Commit 129e946

Browse files
committed
Auto merge of rust-lang#88371 - Manishearth:rollup-pkkjsme, r=Manishearth
Rollup of 11 pull requests Successful merges: - rust-lang#87832 (Fix debugger stepping behavior with `match` expressions) - rust-lang#88123 (Make spans for tuple patterns in E0023 more precise) - rust-lang#88215 (Reland rust-lang#83738: "rustdoc: Don't load all extern crates unconditionally") - rust-lang#88216 (Don't stabilize creation of TryReserveError instances) - rust-lang#88270 (Handle type ascription type ops in NLL HRTB diagnostics) - rust-lang#88289 (Fixes for LLVM change 0f45c16) - rust-lang#88320 (type_implements_trait consider obligation failure on overflow) - rust-lang#88332 (Add argument types tait tests) - rust-lang#88340 (Add `c_size_t` and `c_ssize_t` to `std::os::raw`.) - rust-lang#88346 (Revert "Add type of a let tait test impl trait straight in let") - rust-lang#88348 (Add field types tait tests) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents c51742d + 25ec032 commit 129e946

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
lines changed

alloc/src/collections/mod.rs

Lines changed: 3 additions & 3 deletions
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

std/src/os/raw/mod.rs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,3 +151,17 @@ type_alias_no_nz! { "double.md", c_double = f64; }
151151
#[stable(feature = "raw_os", since = "1.1.0")]
152152
#[doc(no_inline)]
153153
pub use core::ffi::c_void;
154+
155+
/// Equivalent to C's `size_t` type, from `stddef.h` (or `cstddef` for C++).
156+
///
157+
/// This type is currently always [`usize`], however in the future there may be
158+
/// platforms where this is not the case.
159+
#[unstable(feature = "c_size_t", issue = "88345")]
160+
pub type c_size_t = usize;
161+
162+
/// Equivalent to C's `ssize_t` type, from `stddef.h` (or `cstddef` for C++).
163+
///
164+
/// This type is currently always [`isize`], however in the future there may be
165+
/// platforms where this is not the case.
166+
#[unstable(feature = "c_size_t", issue = "88345")]
167+
pub type c_ssize_t = isize;

0 commit comments

Comments
 (0)