diff options
| author | Patrick McCarter <p.mccarter@gmail.com> | 2019-02-22 16:36:39 -0500 |
|---|---|---|
| committer | Patrick McCarter <p.mccarter@gmail.com> | 2019-02-22 16:36:39 -0500 |
| commit | 8ee1c0708a79f7c7234282f419122eeaba6419c7 (patch) | |
| tree | 177b5ae323c4ca2d26c1c78d04d0001b9e25a6ba | |
| parent | 5f27a25cf4eab09e70cdf81f5e548f13fa7fc289 (diff) | |
| download | rust-8ee1c0708a79f7c7234282f419122eeaba6419c7.tar.gz rust-8ee1c0708a79f7c7234282f419122eeaba6419c7.zip | |
Change byte align message wording #58617
| -rw-r--r-- | src/librustc_mir/interpret/validity.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/consts/const-eval/ub-ref.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/consts/const-eval/ub-ref.stderr | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/librustc_mir/interpret/validity.rs b/src/librustc_mir/interpret/validity.rs index 91a43d5c991..6b932b17524 100644 --- a/src/librustc_mir/interpret/validity.rs +++ b/src/librustc_mir/interpret/validity.rs @@ -359,7 +359,7 @@ impl<'rt, 'a, 'mir, 'tcx, M: Machine<'a, 'mir, 'tcx>> return validation_failure!("NULL reference", self.path), EvalErrorKind::AlignmentCheckFailed { required, has } => return validation_failure!(format!("unaligned reference \ - (required {} alignment but found {})", + (required {} byte alignment but found {})", required.bytes(), has.bytes()), self.path), _ => return validation_failure!( diff --git a/src/test/ui/consts/const-eval/ub-ref.rs b/src/test/ui/consts/const-eval/ub-ref.rs index 26dd2520a15..c1e2b095ad1 100644 --- a/src/test/ui/consts/const-eval/ub-ref.rs +++ b/src/test/ui/consts/const-eval/ub-ref.rs @@ -5,7 +5,7 @@ use std::mem; const UNALIGNED: &u16 = unsafe { mem::transmute(&[0u8; 4]) }; //~^ ERROR it is undefined behavior to use this value -//~^^ type validation failed: encountered unaligned reference (required 2 alignment but found 1) +//~^^ type validation failed: encountered unaligned reference (required 2 byte alignment but found 1) const NULL: &u16 = unsafe { mem::transmute(0usize) }; //~^ ERROR it is undefined behavior to use this value diff --git a/src/test/ui/consts/const-eval/ub-ref.stderr b/src/test/ui/consts/const-eval/ub-ref.stderr index 254561c81e1..371467a5d1e 100644 --- a/src/test/ui/consts/const-eval/ub-ref.stderr +++ b/src/test/ui/consts/const-eval/ub-ref.stderr @@ -2,7 +2,7 @@ error[E0080]: it is undefined behavior to use this value --> $DIR/ub-ref.rs:6:1 | LL | const UNALIGNED: &u16 = unsafe { mem::transmute(&[0u8; 4]) }; - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered unaligned reference (required 2 alignment but found 1) + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered unaligned reference (required 2 byte alignment but found 1) | = 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 |