bless you

RalfJung · RalfJung · commit 2feeb88b62e7 · 2020-05-01T10:50:04.000+02:00
diff --git a/src/test/ui/consts/const-eval/ub-wide-ptr.stderr b/src/test/ui/consts/const-eval/ub-wide-ptr.stderr
@@ -186,7 +186,7 @@ error[E0080]: could not evaluate static initializer
   --> $DIR/ub-wide-ptr.rs:121:5
    |
 LL |     mem::transmute::<_, &dyn Trait>((&92u8, 0usize))
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ invalid use of NULL pointer
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ dereferencing NULL pointer
 
 error[E0080]: could not evaluate static initializer
   --> $DIR/ub-wide-ptr.rs:125:5
diff --git a/src/test/ui/consts/offset_from_ub.stderr b/src/test/ui/consts/offset_from_ub.stderr
@@ -66,7 +66,7 @@ error: any use of this value will cause an error
 LL |           intrinsics::ptr_offset_from(self, origin)
    |           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |           |
-   |           invalid use of NULL pointer
+   |           dereferencing NULL pointer
    |           inside `std::ptr::const_ptr::<impl *const u8>::offset_from` at $SRC_DIR/libcore/ptr/const_ptr.rs:LL:COL
    |           inside `OFFSET_FROM_NULL` at $DIR/offset_from_ub.rs:37:14
    | 

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ error[E0080]: could not evaluate static initializer`
`186`	`186`	`--> $DIR/ub-wide-ptr.rs:121:5`
`187`	`187`	`\|`
`188`	`188`	`LL \| mem::transmute::<_, &dyn Trait>((&92u8, 0usize))`
`189`		`- \| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ invalid use of NULL pointer`
	`189`	`+ \| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ dereferencing NULL pointer`
`190`	`190`
`191`	`191`	`error[E0080]: could not evaluate static initializer`
`192`	`192`	`--> $DIR/ub-wide-ptr.rs:125:5`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ error: any use of this value will cause an error`
`66`	`66`	`LL \| intrinsics::ptr_offset_from(self, origin)`
`67`	`67`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`68`	`68`	`\| \|`
`69`		`- \| invalid use of NULL pointer`
	`69`	`+ \| dereferencing NULL pointer`
`70`	`70`	\| inside `std::ptr::const_ptr::<impl *const u8>::offset_from` at $SRC_DIR/libcore/ptr/const_ptr.rs:LL:COL
`71`	`71`	\| inside `OFFSET_FROM_NULL` at $DIR/offset_from_ub.rs:37:14
`72`	`72`	`\|`