diff options
| author | bors <bors@rust-lang.org> | 2024-03-11 10:22:10 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-03-11 10:22:10 +0000 |
| commit | e919669d42dfb8950866d4cb268c5359eb3f7c54 (patch) | |
| tree | 08ac6de3309dc8a896699d04b1b1739bd6e413d4 /library/alloc/src | |
| parent | 66396725541ac7920439876fc79cbc7b604b82e0 (diff) | |
| parent | 5a3d6c91b1892806b0cdda8b03e5ceef64a1989f (diff) | |
Auto merge of #122331 - jhpratt:rollup-cbl8xsy, r=jhpratt
Rollup of 9 pull requests
Successful merges:
- #121148 (Add slice::try_range)
- #121633 (Win10: Use `GetSystemTimePreciseAsFileTime` directly)
- #121840 (Expose the Freeze trait again (unstably) and forbid implementing it manually)
- #121907 (skip sanity check for non-host targets in `check` builds)
- #122002 (std::threads: revisit stack address calculation on netbsd.)
- #122108 (Add `target.*.runner` configuration for targets)
- #122298 (RawVec::into_box: avoid unnecessary intermediate reference)
- #122315 (Allow multiple `impl Into<{D,Subd}iagMessage>` parameters in a function.)
- #122326 (Optimize `process_heap_alloc`)
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'library/alloc/src')
| -rw-r--r-- | library/alloc/src/raw_vec.rs | 3 | ||||
| -rw-r--r-- | library/alloc/src/slice.rs | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/library/alloc/src/raw_vec.rs b/library/alloc/src/raw_vec.rs index ace73c0fdaa..0ee293db73a 100644 --- a/library/alloc/src/raw_vec.rs +++ b/library/alloc/src/raw_vec.rs @@ -5,7 +5,6 @@ use core::cmp; use core::hint; use core::mem::{self, ManuallyDrop, MaybeUninit, SizedTypeProperties}; use core::ptr::{self, NonNull, Unique}; -use core::slice; #[cfg(not(no_global_oom_handling))] use crate::alloc::handle_alloc_error; @@ -192,7 +191,7 @@ impl<T, A: Allocator> RawVec<T, A> { let me = ManuallyDrop::new(self); unsafe { - let slice = slice::from_raw_parts_mut(me.ptr() as *mut MaybeUninit<T>, len); + let slice = ptr::slice_from_raw_parts_mut(me.ptr() as *mut MaybeUninit<T>, len); Box::from_raw_in(slice, ptr::read(&me.alloc)) } } diff --git a/library/alloc/src/slice.rs b/library/alloc/src/slice.rs index f4e392760c8..21d5dce04a0 100644 --- a/library/alloc/src/slice.rs +++ b/library/alloc/src/slice.rs @@ -33,8 +33,6 @@ use crate::vec::Vec; #[cfg(test)] mod tests; -#[unstable(feature = "slice_range", issue = "76393")] -pub use core::slice::range; #[unstable(feature = "array_chunks", issue = "74985")] pub use core::slice::ArrayChunks; #[unstable(feature = "array_chunks", issue = "74985")] @@ -51,6 +49,8 @@ pub use core::slice::{from_mut, from_ref}; pub use core::slice::{from_mut_ptr_range, from_ptr_range}; #[stable(feature = "rust1", since = "1.0.0")] pub use core::slice::{from_raw_parts, from_raw_parts_mut}; +#[unstable(feature = "slice_range", issue = "76393")] +pub use core::slice::{range, try_range}; #[stable(feature = "slice_group_by", since = "1.77.0")] pub use core::slice::{ChunkBy, ChunkByMut}; #[stable(feature = "rust1", since = "1.0.0")] |
