Skip to content

Commit 5e74776

Browse files
committed
Auto merge of rust-lang#139552 - matthiaskrgr:rollup-b194mk8, r=matthiaskrgr
Rollup of 10 pull requests Successful merges: - rust-lang#139494 (Restrict some queries by def-kind more) - rust-lang#139496 (Revert r-a changes of rust-lang#139455) - rust-lang#139506 (add missing word in doc comment (part 2)) - rust-lang#139515 (Improve presentation of closure signature mismatch from `Fn` trait goal) - rust-lang#139520 (compiletest maintenance: sort deps and drop dep on `anyhow`) - rust-lang#139523 (Rustc dev guide subtree update) - rust-lang#139526 (Fix deprecation note for std::intrinsics) - rust-lang#139528 (compiletest: Remove the `--logfile` flag) - rust-lang#139541 (Instantiate higher-ranked transmute goal w/ placeholders before emitting sub-obligations) - rust-lang#139547 (Update library tracking issue template to set S-tracking-unimplemented) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 910a867 + ff64fc4 commit 5e74776

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Diff for: 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)