X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=library%2Fcore%2Fsrc%2Fptr%2Fmut_ptr.rs;h=a6424041542d9054c79e060f23772de186088cc3;hb=9d96b0ed8c0f37bc09e737e1ab5880e8f5dd43f2;hp=292ac3e3f7fec3a664588d4b00b8ed05facc96e0;hpb=dd5fc8edb83bf54f37b27a95b56f9dc7390c8d32;p=rust.git diff --git a/library/core/src/ptr/mut_ptr.rs b/library/core/src/ptr/mut_ptr.rs index 292ac3e3f7f..a6424041542 100644 --- a/library/core/src/ptr/mut_ptr.rs +++ b/library/core/src/ptr/mut_ptr.rs @@ -42,7 +42,7 @@ pub const fn is_null(self) -> bool { /// Casts to a pointer of another type. #[stable(feature = "ptr_cast", since = "1.38.0")] #[rustc_const_stable(feature = "const_ptr_cast", since = "1.38.0")] - #[inline] + #[inline(always)] pub const fn cast(self) -> *mut U { self as _ } @@ -551,7 +551,7 @@ pub const fn guaranteed_eq(self, other: *mut T) -> bool /// ``` #[stable(feature = "ptr_offset_from", since = "1.47.0")] #[rustc_const_unstable(feature = "const_ptr_offset_from", issue = "41079")] - #[inline] + #[inline(always)] pub const unsafe fn offset_from(self, origin: *const T) -> isize where T: Sized, @@ -859,7 +859,7 @@ pub fn set_ptr_value(mut self, val: *mut u8) -> Self { /// [`ptr::read`]: crate::ptr::read() #[stable(feature = "pointer_methods", since = "1.26.0")] #[rustc_const_unstable(feature = "const_ptr_read", issue = "80377")] - #[inline] + #[inline(always)] pub const unsafe fn read(self) -> T where T: Sized, @@ -879,7 +879,7 @@ pub fn set_ptr_value(mut self, val: *mut u8) -> Self { /// /// [`ptr::read_volatile`]: crate::ptr::read_volatile() #[stable(feature = "pointer_methods", since = "1.26.0")] - #[inline] + #[inline(always)] pub unsafe fn read_volatile(self) -> T where T: Sized, @@ -898,7 +898,7 @@ pub unsafe fn read_volatile(self) -> T /// [`ptr::read_unaligned`]: crate::ptr::read_unaligned() #[stable(feature = "pointer_methods", since = "1.26.0")] #[rustc_const_unstable(feature = "const_ptr_read", issue = "80377")] - #[inline] + #[inline(always)] pub const unsafe fn read_unaligned(self) -> T where T: Sized, @@ -917,7 +917,7 @@ pub unsafe fn read_volatile(self) -> T /// [`ptr::copy`]: crate::ptr::copy() #[rustc_const_unstable(feature = "const_intrinsic_copy", issue = "80697")] #[stable(feature = "pointer_methods", since = "1.26.0")] - #[inline] + #[inline(always)] pub const unsafe fn copy_to(self, dest: *mut T, count: usize) where T: Sized, @@ -936,7 +936,7 @@ pub unsafe fn read_volatile(self) -> T /// [`ptr::copy_nonoverlapping`]: crate::ptr::copy_nonoverlapping() #[rustc_const_unstable(feature = "const_intrinsic_copy", issue = "80697")] #[stable(feature = "pointer_methods", since = "1.26.0")] - #[inline] + #[inline(always)] pub const unsafe fn copy_to_nonoverlapping(self, dest: *mut T, count: usize) where T: Sized, @@ -955,7 +955,7 @@ pub unsafe fn read_volatile(self) -> T /// [`ptr::copy`]: crate::ptr::copy() #[rustc_const_unstable(feature = "const_intrinsic_copy", issue = "80697")] #[stable(feature = "pointer_methods", since = "1.26.0")] - #[inline] + #[inline(always)] pub const unsafe fn copy_from(self, src: *const T, count: usize) where T: Sized, @@ -974,7 +974,7 @@ pub unsafe fn read_volatile(self) -> T /// [`ptr::copy_nonoverlapping`]: crate::ptr::copy_nonoverlapping() #[rustc_const_unstable(feature = "const_intrinsic_copy", issue = "80697")] #[stable(feature = "pointer_methods", since = "1.26.0")] - #[inline] + #[inline(always)] pub const unsafe fn copy_from_nonoverlapping(self, src: *const T, count: usize) where T: Sized, @@ -989,7 +989,7 @@ pub unsafe fn read_volatile(self) -> T /// /// [`ptr::drop_in_place`]: crate::ptr::drop_in_place() #[stable(feature = "pointer_methods", since = "1.26.0")] - #[inline] + #[inline(always)] pub unsafe fn drop_in_place(self) { // SAFETY: the caller must uphold the safety contract for `drop_in_place`. unsafe { drop_in_place(self) } @@ -1002,9 +1002,8 @@ pub unsafe fn drop_in_place(self) { /// /// [`ptr::write`]: crate::ptr::write() #[stable(feature = "pointer_methods", since = "1.26.0")] - #[rustc_const_unstable(feature = "const_ptr_write", issue = "none")] - #[inline] - pub const unsafe fn write(self, val: T) + #[inline(always)] + pub unsafe fn write(self, val: T) where T: Sized, { @@ -1019,7 +1018,7 @@ pub unsafe fn drop_in_place(self) { /// /// [`ptr::write_bytes`]: crate::ptr::write_bytes() #[stable(feature = "pointer_methods", since = "1.26.0")] - #[inline] + #[inline(always)] pub unsafe fn write_bytes(self, val: u8, count: usize) where T: Sized, @@ -1039,7 +1038,7 @@ pub unsafe fn write_bytes(self, val: u8, count: usize) /// /// [`ptr::write_volatile`]: crate::ptr::write_volatile() #[stable(feature = "pointer_methods", since = "1.26.0")] - #[inline] + #[inline(always)] pub unsafe fn write_volatile(self, val: T) where T: Sized, @@ -1058,7 +1057,7 @@ pub unsafe fn write_volatile(self, val: T) /// [`ptr::write_unaligned`]: crate::ptr::write_unaligned() #[stable(feature = "pointer_methods", since = "1.26.0")] #[rustc_const_unstable(feature = "const_ptr_write", issue = "none")] - #[inline] + #[inline(always)] pub const unsafe fn write_unaligned(self, val: T) where T: Sized, @@ -1074,7 +1073,7 @@ pub unsafe fn write_volatile(self, val: T) /// /// [`ptr::replace`]: crate::ptr::replace() #[stable(feature = "pointer_methods", since = "1.26.0")] - #[inline] + #[inline(always)] pub unsafe fn replace(self, src: T) -> T where T: Sized, @@ -1091,7 +1090,7 @@ pub unsafe fn replace(self, src: T) -> T /// /// [`ptr::swap`]: crate::ptr::swap() #[stable(feature = "pointer_methods", since = "1.26.0")] - #[inline] + #[inline(always)] pub unsafe fn swap(self, with: *mut T) where T: Sized, @@ -1170,7 +1169,7 @@ impl *mut [T] { /// let slice: *mut [i8] = ptr::slice_from_raw_parts_mut(ptr::null_mut(), 3); /// assert_eq!(slice.len(), 3); /// ``` - #[inline] + #[inline(always)] #[unstable(feature = "slice_ptr_len", issue = "71146")] #[rustc_const_unstable(feature = "const_slice_ptr_len", issue = "71146")] pub const fn len(self) -> usize { @@ -1190,7 +1189,7 @@ pub const fn len(self) -> usize { /// let slice: *mut [i8] = ptr::slice_from_raw_parts_mut(ptr::null_mut(), 3); /// assert_eq!(slice.as_mut_ptr(), 0 as *mut i8); /// ``` - #[inline] + #[inline(always)] #[unstable(feature = "slice_ptr_get", issue = "74265")] #[rustc_const_unstable(feature = "slice_ptr_get", issue = "74265")] pub const fn as_mut_ptr(self) -> *mut T { @@ -1217,7 +1216,7 @@ pub const fn as_mut_ptr(self) -> *mut T { /// } /// ``` #[unstable(feature = "slice_ptr_get", issue = "74265")] - #[inline] + #[inline(always)] pub unsafe fn get_unchecked_mut(self, index: I) -> *mut I::Output where I: SliceIndex<[T]>, @@ -1332,7 +1331,7 @@ pub unsafe fn as_uninit_slice_mut<'a>(self) -> Option<&'a mut [MaybeUninit]> // Equality for pointers #[stable(feature = "rust1", since = "1.0.0")] impl PartialEq for *mut T { - #[inline] + #[inline(always)] fn eq(&self, other: &*mut T) -> bool { *self == *other } @@ -1357,27 +1356,27 @@ fn cmp(&self, other: &*mut T) -> Ordering { #[stable(feature = "rust1", since = "1.0.0")] impl PartialOrd for *mut T { - #[inline] + #[inline(always)] fn partial_cmp(&self, other: &*mut T) -> Option { Some(self.cmp(other)) } - #[inline] + #[inline(always)] fn lt(&self, other: &*mut T) -> bool { *self < *other } - #[inline] + #[inline(always)] fn le(&self, other: &*mut T) -> bool { *self <= *other } - #[inline] + #[inline(always)] fn gt(&self, other: &*mut T) -> bool { *self > *other } - #[inline] + #[inline(always)] fn ge(&self, other: &*mut T) -> bool { *self >= *other }