mirror of
https://github.com/rust-lang/rust.git
synced 2025-04-29 19:47:38 +00:00
f012947bf0
Tweak output of const panic diagnostic
### Shorten span of panic failures in const context
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();
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ panic: 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!();
| ^^^^^^^^ 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:87:9
|
LL | assert!(false);
| ^^^^^^^^^^^^^^ assertion failed: false
|
= note: this error originates in the macro `assert` (in Nightly builds, run with -Z macro-backtrace for more info)
```
### Remove duplicated span from const eval frame list
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(&[], |_| {});
| ^^^^^^^^^^^^^^ 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)
note: erroneous constant encountered
--> $DIR/issue-88434-removal-index-should-be-less.rs:3:23
|
LL | const _CONST: &[u8] = &f(&[], |_| {});
| ^^^^^^^^^^^^^^^
```
r? ``@oli-obk``
|
||
|---|---|---|
| .. | ||
| aggregate-lang | ||
| base-layout-is-sized-ice-123078.rs | ||
| base-layout-is-sized-ice-123078.stderr | ||
| big-type-no-err.rs | ||
| cannot-transmute-unnormalizable-type.rs | ||
| cannot-transmute-unnormalizable-type.stderr | ||
| debug.rs | ||
| debug.stderr | ||
| enum-scalar-pair-int-ptr.rs | ||
| enum-scalar-pair-int-ptr.stderr | ||
| enum.rs | ||
| enum.stderr | ||
| failed-to-get-layout-for-type-error-ice-92979.rs | ||
| failed-to-get-layout-for-type-error-ice-92979.stderr | ||
| gce-rigid-const-in-array-len.rs | ||
| gce-rigid-const-in-array-len.stderr | ||
| hexagon-enum.rs | ||
| hexagon-enum.stderr | ||
| homogeneous-aggr-transparent.rs | ||
| homogeneous-aggr-transparent.stderr | ||
| homogeneous-aggr-zero-sized-c-struct.rs | ||
| homogeneous-aggr-zero-sized-c-struct.stderr | ||
| homogeneous-aggr-zero-sized-repr-rust.rs | ||
| homogeneous-aggr-zero-sized-repr-rust.stderr | ||
| ice-non-last-unsized-field-issue-121473.rs | ||
| ice-non-last-unsized-field-issue-121473.stderr | ||
| ice-type-error-in-tail-124031.rs | ||
| ice-type-error-in-tail-124031.stderr | ||
| invalid-unsized-const-eval.rs | ||
| invalid-unsized-const-eval.stderr | ||
| invalid-unsized-const-prop.rs | ||
| invalid-unsized-in-always-sized-tail.rs | ||
| invalid-unsized-in-always-sized-tail.stderr | ||
| issue-60431-unsized-tail-behind-projection.rs | ||
| issue-84108.rs | ||
| issue-84108.stderr | ||
| issue-96158-scalarpair-payload-might-be-uninit.rs | ||
| issue-96158-scalarpair-payload-might-be-uninit.stderr | ||
| issue-96185-overaligned-enum.rs | ||
| issue-96185-overaligned-enum.stderr | ||
| issue-112048-unsizing-field-order.rs | ||
| issue-112048-unsizing-niche.rs | ||
| issue-113941.rs | ||
| issue-unsized-tail-restatic-ice-122488.rs | ||
| issue-unsized-tail-restatic-ice-122488.stderr | ||
| layout-cycle.rs | ||
| layout-cycle.stderr | ||
| malformed-unsized-type-in-union.rs | ||
| malformed-unsized-type-in-union.stderr | ||
| normalization-failure.rs | ||
| normalization-failure.stderr | ||
| post-mono-layout-cycle-2.rs | ||
| post-mono-layout-cycle-2.stderr | ||
| post-mono-layout-cycle.rs | ||
| post-mono-layout-cycle.stderr | ||
| randomize.rs | ||
| reprc-power-alignment.rs | ||
| reprc-power-alignment.stderr | ||
| rust-call-abi-not-a-tuple-ice-81974.rs | ||
| rust-call-abi-not-a-tuple-ice-81974.stderr | ||
| size-of-val-raw-too-big.rs | ||
| size-of-val-raw-too-big.stderr | ||
| struct.rs | ||
| struct.stderr | ||
| thaw-transmute-invalid-enum.rs | ||
| thaw-transmute-invalid-enum.stderr | ||
| thaw-validate-invalid-enum.rs | ||
| thaw-validate-invalid-enum.stderr | ||
| thin-meta-implies-thin-ptr.rs | ||
| thumb-enum.rs | ||
| thumb-enum.stderr | ||
| too-big-with-padding.rs | ||
| too-big-with-padding.stderr | ||
| transmute-to-tail-with-err.rs | ||
| transmute-to-tail-with-err.stderr | ||
| trivial-bounds-sized.rs | ||
| uncomputable-due-to-trivial-bounds-ice-135138.rs | ||
| uncomputable-due-to-trivial-bounds-ice-135138.stderr | ||
| unconstrained-param-ice-137308.rs | ||
| unconstrained-param-ice-137308.stderr | ||
| unexpected-unsized-field-issue-135020.rs | ||
| unknown-when-no-type-parameter.rs | ||
| unknown-when-no-type-parameter.stderr | ||
| unknown-when-ptr-metadata-is-DST.rs | ||
| unknown-when-ptr-metadata-is-DST.stderr | ||
| unsafe-cell-hides-niche.rs | ||
| unsatisfiable-sized-ungated.rs | ||
| valid_range_oob.rs | ||
| valid_range_oob.stderr | ||
| zero-sized-array-enum-niche.rs | ||
| zero-sized-array-enum-niche.stderr | ||
| zero-sized-array-union.rs | ||
| zero-sized-array-union.stderr | ||