7d4d09eeeb
Previously, we included a redundant prefix on the panic message and a postfix of the location of the panic. The prefix didn't carry any additional information beyond "something failed", and the location of the panic is redundant with the diagnostic's span, which gets printed out even if its code is not shown.
```
error[E0080]: evaluation of constant value failed
--> $DIR/assert-type-intrinsics.rs:11:9
|
LL | MaybeUninit::<!>::uninit().assume_init();
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ evaluation panicked: aborted execution: attempted to instantiate uninhabited type `!`
```
```
error[E0080]: evaluation of `Fail::<i32>::C` failed
--> $DIR/collect-in-dead-closure.rs:9:19
|
LL | const C: () = panic!();
| ^^^^^^^^ evaluation panicked: explicit panic
|
= note: this error originates in the macro
`$crate::panic::panic_2015` which comes from the expansion of the macro
`panic` (in Nightly builds, run with -Z macro-backtrace for more info)
```
```
error[E0080]: evaluation of constant value failed
--> $DIR/uninhabited.rs:41:9
|
LL | assert!(false);
| ^^^^^^^^^^^^^^ evaluation panicked: assertion failed: false
|
= note: this error originates in the macro `assert` (in Nightly builds, run with -Z macro-backtrace for more info)
```
---
When the primary span for a const error is the same as the first frame in the const error report, skip it.
```
error[E0080]: evaluation of constant value failed
--> $DIR/issue-88434-removal-index-should-be-less.rs:3:24
|
LL | const _CONST: &[u8] = &f(&[], |_| {});
| ^^^^^^^^^^^^^^ evaluation panicked: explicit panic
|
note: inside `f::<{closure@$DIR/issue-88434-removal-index-should-be-less.rs:3:31: 3:34}>`
--> $DIR/issue-88434-removal-index-should-be-less.rs:10:5
|
LL | panic!()
| ^^^^^^^^ the failure occurred here
= note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
```
instead of
```
error[E0080]: evaluation of constant value failed
--> $DIR/issue-88434-removal-index-should-be-less.rs:10:5
|
LL | panic!()
| ^^^^^^^^ explicit panic
|
note: inside `f::<{closure@$DIR/issue-88434-removal-index-should-be-less.rs:3:31: 3:34}>`
--> $DIR/issue-88434-removal-index-should-be-less.rs:10:5
|
LL | panic!()
| ^^^^^^^^
note: inside `_CONST`
--> $DIR/issue-88434-removal-index-should-be-less.rs:3:24
|
LL | const _CONST: &[u8] = &f(&[], |_| {});
| ^^^^^^^^^^^^^^
= note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
```
---
Revert order of constant evaluation errors
Point at the code the user wrote first and std functions last.
```
error[E0080]: evaluation of constant value failed
--> $DIR/const-errs-dont-conflict-103369.rs:5:25
|
LL | impl ConstGenericTrait<{my_fn(1)}> for () {}
| ^^^^^^^^ evaluation panicked: Some error occurred
|
note: called from `my_fn`
--> $DIR/const-errs-dont-conflict-103369.rs:10:5
|
LL | panic!("Some error occurred");
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
= note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
```
instead of
```
error[E0080]: evaluation of constant value failed
--> $DIR/const-errs-dont-conflict-103369.rs:10:5
|
LL | panic!("Some error occurred");
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Some error occurred
|
note: called from `<() as ConstGenericTrait<{my_fn(1)}>>::{constant#0}`
--> $DIR/const-errs-dont-conflict-103369.rs:5:25
|
LL | impl ConstGenericTrait<{my_fn(1)}> for () {}
| ^^^^^^^^
= note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
```
45 lines
1.6 KiB
Rust
45 lines
1.6 KiB
Rust
const MISALIGNED_LOAD: () = unsafe {
|
|
let mem = [0u32; 8];
|
|
let ptr = mem.as_ptr().byte_add(1);
|
|
let _val = *ptr; //~ERROR: evaluation of constant value failed
|
|
//~^NOTE: based on pointer with alignment 1, but alignment 4 is required
|
|
};
|
|
|
|
const MISALIGNED_STORE: () = unsafe {
|
|
let mut mem = [0u32; 8];
|
|
let ptr = mem.as_mut_ptr().byte_add(1);
|
|
*ptr = 0; //~ERROR: evaluation of constant value failed
|
|
//~^NOTE: based on pointer with alignment 1, but alignment 4 is required
|
|
};
|
|
|
|
const MISALIGNED_COPY: () = unsafe {
|
|
let x = &[0_u8; 4];
|
|
let y = x.as_ptr().cast::<u32>();
|
|
let mut z = 123;
|
|
y.copy_to_nonoverlapping(&mut z, 1);
|
|
//~^ ERROR evaluation of constant value failed
|
|
//~| NOTE inside `std::ptr::const_ptr
|
|
//~| NOTE inside `copy_nonoverlapping::<u32>`
|
|
//~| NOTE accessing memory with alignment 1, but alignment 4 is required
|
|
// The actual error points into the implementation of `copy_to_nonoverlapping`.
|
|
};
|
|
|
|
const MISALIGNED_FIELD: () = unsafe {
|
|
#[repr(align(16))]
|
|
struct Aligned(f32);
|
|
|
|
let mem = [0f32; 8];
|
|
let ptr = mem.as_ptr().cast::<Aligned>();
|
|
// Accessing an f32 field but we still require the alignment of the pointer type.
|
|
let _val = (*ptr).0; //~ERROR: evaluation of constant value failed
|
|
//~^NOTE: based on pointer with alignment 4, but alignment 16 is required
|
|
};
|
|
|
|
const OOB: () = unsafe {
|
|
let mem = [0u32; 1];
|
|
let ptr = mem.as_ptr().cast::<u64>();
|
|
let _val = *ptr; //~ERROR: evaluation of constant value failed
|
|
//~^NOTE: expected a pointer to 8 bytes of memory
|
|
};
|
|
|
|
fn main() {}
|