Merging upstream version 1.76.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 12 insertions, 12 deletions

diff --git a/tests/ui/consts/offset_ub.stderr b/tests/ui/consts/offset_ub.stderr
index 8bc59d50e..b398b2039 100644
--- a/tests/ui/consts/offset_ub.stderr
+++ b/tests/ui/consts/offset_ub.stderr
@@ -3,7 +3,7 @@ error[E0080]: evaluation of constant value failed
    |
    = note: overflowing in-bounds pointer arithmetic
    |
-note: inside `ptr::const_ptr::<impl *const u8>::offset`
+note: inside `std::ptr::const_ptr::<impl *const u8>::offset`
   --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
 note: inside `BEFORE_START`
   --> $DIR/offset_ub.rs:7:46
@@ -16,7 +16,7 @@ error[E0080]: evaluation of constant value failed
    |
    = note: out-of-bounds pointer arithmetic: ALLOC0 has size 1, so pointer to 2 bytes starting at offset 0 is out-of-bounds
    |
-note: inside `ptr::const_ptr::<impl *const u8>::offset`
+note: inside `std::ptr::const_ptr::<impl *const u8>::offset`
   --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
 note: inside `AFTER_END`
   --> $DIR/offset_ub.rs:8:43
@@ -29,7 +29,7 @@ error[E0080]: evaluation of constant value failed
    |
    = note: out-of-bounds pointer arithmetic: ALLOC1 has size 100, so pointer to 101 bytes starting at offset 0 is out-of-bounds
    |
-note: inside `ptr::const_ptr::<impl *const u8>::offset`
+note: inside `std::ptr::const_ptr::<impl *const u8>::offset`
   --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
 note: inside `AFTER_ARRAY`
   --> $DIR/offset_ub.rs:9:45
@@ -42,7 +42,7 @@ error[E0080]: evaluation of constant value failed
    |
    = note: overflowing in-bounds pointer arithmetic
    |
-note: inside `ptr::const_ptr::<impl *const u16>::offset`
+note: inside `std::ptr::const_ptr::<impl *const u16>::offset`
   --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
 note: inside `OVERFLOW`
   --> $DIR/offset_ub.rs:11:43
@@ -55,7 +55,7 @@ error[E0080]: evaluation of constant value failed
    |
    = note: overflowing in-bounds pointer arithmetic
    |
-note: inside `ptr::const_ptr::<impl *const u16>::offset`
+note: inside `std::ptr::const_ptr::<impl *const u16>::offset`
   --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
 note: inside `UNDERFLOW`
   --> $DIR/offset_ub.rs:12:44
@@ -68,7 +68,7 @@ error[E0080]: evaluation of constant value failed
    |
    = note: overflowing in-bounds pointer arithmetic
    |
-note: inside `ptr::const_ptr::<impl *const u8>::offset`
+note: inside `std::ptr::const_ptr::<impl *const u8>::offset`
   --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
 note: inside `OVERFLOW_ADDRESS_SPACE`
   --> $DIR/offset_ub.rs:13:56
@@ -81,7 +81,7 @@ error[E0080]: evaluation of constant value failed
    |
    = note: overflowing in-bounds pointer arithmetic
    |
-note: inside `ptr::const_ptr::<impl *const u8>::offset`
+note: inside `std::ptr::const_ptr::<impl *const u8>::offset`
   --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
 note: inside `UNDERFLOW_ADDRESS_SPACE`
   --> $DIR/offset_ub.rs:14:57
@@ -94,7 +94,7 @@ error[E0080]: evaluation of constant value failed
    |
    = note: out-of-bounds pointer arithmetic: ALLOC2 has size 1, so pointer to 2 bytes starting at offset -4 is out-of-bounds
    |
-note: inside `ptr::const_ptr::<impl *const u8>::offset`
+note: inside `std::ptr::const_ptr::<impl *const u8>::offset`
   --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
 note: inside `NEGATIVE_OFFSET`
   --> $DIR/offset_ub.rs:15:49
@@ -107,7 +107,7 @@ error[E0080]: evaluation of constant value failed
    |
    = note: out-of-bounds pointer arithmetic: ALLOC3 has size 0, so pointer to 1 byte starting at offset 0 is out-of-bounds
    |
-note: inside `ptr::const_ptr::<impl *const u8>::offset`
+note: inside `std::ptr::const_ptr::<impl *const u8>::offset`
   --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
 note: inside `ZERO_SIZED_ALLOC`
   --> $DIR/offset_ub.rs:17:50
@@ -120,7 +120,7 @@ error[E0080]: evaluation of constant value failed
    |
    = note: out-of-bounds pointer arithmetic: 0x1[noalloc] is a dangling pointer (it has no provenance)
    |
-note: inside `ptr::mut_ptr::<impl *mut u8>::offset`
+note: inside `std::ptr::mut_ptr::<impl *mut u8>::offset`
   --> $SRC_DIR/core/src/ptr/mut_ptr.rs:LL:COL
 note: inside `DANGLING`
   --> $DIR/offset_ub.rs:18:42
@@ -133,7 +133,7 @@ error[E0080]: evaluation of constant value failed
    |
    = note: out-of-bounds pointer arithmetic: null pointer is a dangling pointer (it has no provenance)
    |
-note: inside `ptr::const_ptr::<impl *const u8>::offset`
+note: inside `std::ptr::const_ptr::<impl *const u8>::offset`
   --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
 note: inside `NULL_OFFSET_ZERO`
   --> $DIR/offset_ub.rs:21:50
@@ -146,7 +146,7 @@ error[E0080]: evaluation of constant value failed
    |
    = note: out-of-bounds pointer arithmetic: 0x7f..f[noalloc] is a dangling pointer (it has no provenance)
    |
-note: inside `ptr::const_ptr::<impl *const u8>::offset`
+note: inside `std::ptr::const_ptr::<impl *const u8>::offset`
   --> $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL
 note: inside `UNDERFLOW_ABS`
   --> $DIR/offset_ub.rs:24:47