Skip to content

Commit 51bc376

Browse files
authored
Rollup merge of #139526 - smanilov:issue-139505, r=RalfJung
Fix deprecation note for std::intrinsics Also checked the rest of the mentions of std::mem in the changed file and they look good to me. Fixes #139505
2 parents 87dfd12 + 245cf8e commit 51bc376

File tree

1 file changed

+3
-3
lines changed
  • library/core/src/intrinsics

1 file changed

+3
-3
lines changed

Diff for: library/core/src/intrinsics/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -3720,7 +3720,7 @@ pub const fn ptr_metadata<P: ptr::Pointee<Metadata = M> + ?Sized, M>(ptr: *const
37203720
/// [`Vec::append`]: ../../std/vec/struct.Vec.html#method.append
37213721
#[doc(alias = "memcpy")]
37223722
#[stable(feature = "rust1", since = "1.0.0")]
3723-
#[rustc_allowed_through_unstable_modules = "import this function via `std::mem` instead"]
3723+
#[rustc_allowed_through_unstable_modules = "import this function via `std::ptr` instead"]
37243724
#[rustc_const_stable(feature = "const_intrinsic_copy", since = "1.83.0")]
37253725
#[inline(always)]
37263726
#[cfg_attr(miri, track_caller)] // even without panics, this helps for Miri backtraces
@@ -3823,7 +3823,7 @@ pub const unsafe fn copy_nonoverlapping<T>(src: *const T, dst: *mut T, count: us
38233823
/// ```
38243824
#[doc(alias = "memmove")]
38253825
#[stable(feature = "rust1", since = "1.0.0")]
3826-
#[rustc_allowed_through_unstable_modules = "import this function via `std::mem` instead"]
3826+
#[rustc_allowed_through_unstable_modules = "import this function via `std::ptr` instead"]
38273827
#[rustc_const_stable(feature = "const_intrinsic_copy", since = "1.83.0")]
38283828
#[inline(always)]
38293829
#[cfg_attr(miri, track_caller)] // even without panics, this helps for Miri backtraces
@@ -3903,7 +3903,7 @@ pub const unsafe fn copy<T>(src: *const T, dst: *mut T, count: usize) {
39033903
/// ```
39043904
#[doc(alias = "memset")]
39053905
#[stable(feature = "rust1", since = "1.0.0")]
3906-
#[rustc_allowed_through_unstable_modules = "import this function via `std::mem` instead"]
3906+
#[rustc_allowed_through_unstable_modules = "import this function via `std::ptr` instead"]
39073907
#[rustc_const_stable(feature = "const_ptr_write", since = "1.83.0")]
39083908
#[inline(always)]
39093909
#[cfg_attr(miri, track_caller)] // even without panics, this helps for Miri backtraces

0 commit comments

Comments
 (0)