diff options
| author | bors <bors@rust-lang.org> | 2025-05-15 23:30:38 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-05-15 23:30:38 +0000 |
| commit | 6d1875f99b2d5c1499410505f4233fbf8dbdc23b (patch) | |
| tree | 063b204c82b9c15f26adc84f19fb0f64e48a4dd0 /library/alloc | |
| parent | d97326eabfc3b2c33abcb08d6bc117aefa697cb7 (diff) | |
| parent | 3e6a2861e43e910a9604bd69fc17febe2324b449 (diff) | |
Auto merge of #141050 - matthiaskrgr:rollup-uyzqbmj, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #139749 (docs(library/core/src/pin): fix typo "necessarily" -> "necessary") - #140685 (Simplify `Vec::as_non_null` implementation and make it `const`) - #140712 (normalization: avoid incompletely constraining GAT args) - #140768 (Improve `dangerous_implicit_aurorefs` diagnostic output) - #140947 (Flush errors before deep normalize in `dropck_outlives`) - #140990 (VxWorks: updates from recent libc versions) - #141027 (remove `RustfmtState` to reduce `initial_rustfmt` complexity) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/alloc')
| -rw-r--r-- | library/alloc/src/raw_vec/mod.rs | 2 | ||||
| -rw-r--r-- | library/alloc/src/vec/mod.rs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/library/alloc/src/raw_vec/mod.rs b/library/alloc/src/raw_vec/mod.rs index a989e5b55b3..3e006a2d1bd 100644 --- a/library/alloc/src/raw_vec/mod.rs +++ b/library/alloc/src/raw_vec/mod.rs @@ -287,7 +287,7 @@ impl<T, A: Allocator> RawVec<T, A> { } #[inline] - pub(crate) fn non_null(&self) -> NonNull<T> { + pub(crate) const fn non_null(&self) -> NonNull<T> { self.inner.non_null() } diff --git a/library/alloc/src/vec/mod.rs b/library/alloc/src/vec/mod.rs index a97912304c8..59879f23d78 100644 --- a/library/alloc/src/vec/mod.rs +++ b/library/alloc/src/vec/mod.rs @@ -1816,10 +1816,10 @@ impl<T, A: Allocator> Vec<T, A> { /// [`as_ptr`]: Vec::as_ptr /// [`as_non_null`]: Vec::as_non_null #[unstable(feature = "box_vec_non_null", reason = "new API", issue = "130364")] + #[rustc_const_unstable(feature = "box_vec_non_null", reason = "new API", issue = "130364")] #[inline] - pub fn as_non_null(&mut self) -> NonNull<T> { - // SAFETY: A `Vec` always has a non-null pointer. - unsafe { NonNull::new_unchecked(self.as_mut_ptr()) } + pub const fn as_non_null(&mut self) -> NonNull<T> { + self.buf.non_null() } /// Returns a reference to the underlying allocator. |
