rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Rename unsigned_offset_from to sub_ptr

Browse Source
This commit is contained in:
Scott McMurray
2022-04-09 14:14:35 -07:00
parent 89a18cb600
commit e76b3f3b5b
11 changed files with 46 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
library/core/src/slice/raw.rs
View File

@@ -215,7 +215,7 @@ pub const fn from_mut<T>(s: &mut T) -> &mut [T] {
#[unstable(feature = "slice_from_ptr_range", issue = "89792")]
pub unsafe fn from_ptr_range<'a, T>(range: Range<*const T>) -> &'a [T] {
// SAFETY: the caller must uphold the safety contract for `from_ptr_range`.
unsafe { from_raw_parts(range.start, range.end.unsigned_offset_from(range.start)) }
unsafe { from_raw_parts(range.start, range.end.sub_ptr(range.start)) }
}
/// Performs the same functionality as [`from_ptr_range`], except that a
@@ -265,5 +265,5 @@ pub unsafe fn from_ptr_range<'a, T>(range: Range<*const T>) -> &'a [T] {
#[unstable(feature = "slice_from_ptr_range", issue = "89792")]
pub unsafe fn from_mut_ptr_range<'a, T>(range: Range<*mut T>) -> &'a mut [T] {
// SAFETY: the caller must uphold the safety contract for `from_mut_ptr_range`.
unsafe { from_raw_parts_mut(range.start, range.end.unsigned_offset_from(range.start)) }
unsafe { from_raw_parts_mut(range.start, range.end.sub_ptr(range.start)) }
}