Skip to content

Commit 8ee1c07

Browse files
committed
Change byte align message wording rust-lang#58617
1 parent 5f27a25 commit 8ee1c07

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/librustc_mir/interpret/validity.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ impl<'rt, 'a, 'mir, 'tcx, M: Machine<'a, 'mir, 'tcx>>
359359
return validation_failure!("NULL reference", self.path),
360360
EvalErrorKind::AlignmentCheckFailed { required, has } =>
361361
return validation_failure!(format!("unaligned reference \
362-
(required {} alignment but found {})",
362+
(required {} byte alignment but found {})",
363363
required.bytes(), has.bytes()), self.path),
364364
_ =>
365365
return validation_failure!(

src/test/ui/consts/const-eval/ub-ref.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use std::mem;
55

66
const UNALIGNED: &u16 = unsafe { mem::transmute(&[0u8; 4]) };
77
//~^ ERROR it is undefined behavior to use this value
8-
//~^^ type validation failed: encountered unaligned reference (required 2 alignment but found 1)
8+
//~^^ type validation failed: encountered unaligned reference (required 2 byte alignment but found 1)
99

1010
const NULL: &u16 = unsafe { mem::transmute(0usize) };
1111
//~^ ERROR it is undefined behavior to use this value

src/test/ui/consts/const-eval/ub-ref.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0080]: it is undefined behavior to use this value
22
--> $DIR/ub-ref.rs:6:1
33
|
44
LL | const UNALIGNED: &u16 = unsafe { mem::transmute(&[0u8; 4]) };
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered unaligned reference (required 2 alignment but found 1)
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered unaligned reference (required 2 byte alignment but found 1)
66
|
77
= note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rust compiler repository if you believe it should not be considered undefined behavior
88

0 commit comments

Comments
 (0)