diff options
| author | bors <bors@rust-lang.org> | 2020-11-14 18:03:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-11-14 18:03:17 +0000 |
| commit | 0c7a48c5f0863843ee2002d40f2bc08ae3777bd9 (patch) | |
| tree | a47881d9894bc3f340813bea79d83c41ec50aa37 | |
| parent | 3a648ffc02823ad7ba20188876663ed25903f1b5 (diff) | |
| parent | 7987f39ad544ba2c788fed5ea4d9cda19cde63c2 (diff) | |
| download | rust-0c7a48c5f0863843ee2002d40f2bc08ae3777bd9.tar.gz rust-0c7a48c5f0863843ee2002d40f2bc08ae3777bd9.zip | |
Auto merge of #78809 - vn-ki:fix-issue-76064, r=oli-obk
add error_occured field to ConstQualifs, fix #76064 I wasn't sure what `in_return_place` actually did and not sure why it returns `ConstQualifs` while it's sibling functions return `bool`. So I tried to make as minimal changes to the structure as possible. Please point out whether I have to refactor it or not. r? `@oli-obk` cc `@RalfJung`
| -rw-r--r-- | tests/ui/crashes/ice-6252.stderr | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/tests/ui/crashes/ice-6252.stderr b/tests/ui/crashes/ice-6252.stderr index 440973e2439..eaa5e6f51cb 100644 --- a/tests/ui/crashes/ice-6252.stderr +++ b/tests/ui/crashes/ice-6252.stderr @@ -26,21 +26,7 @@ LL | const VAL: T; LL | impl<N, M> TypeVal<usize> for Multiply<N, M> where N: TypeVal<VAL> {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ missing `VAL` in implementation -error: any use of this value will cause an error - --> $DIR/ice-6252.rs:5:5 - | -LL | const VAL: T; - | ^^^^^^^^^^^^^ no MIR body is available for DefId(0:5 ~ ice_6252[317d]::TypeVal::VAL) - | - = note: `#[deny(const_err)]` on by default - -error[E0080]: evaluation of constant value failed - --> $DIR/ice-6252.rs:14:9 - | -LL | [1; <Multiply<Five, Five>>::VAL]; - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ referenced constant has errors - -error: aborting due to 5 previous errors +error: aborting due to 3 previous errors -Some errors have detailed explanations: E0046, E0080, E0412. +Some errors have detailed explanations: E0046, E0412. For more information about an error, try `rustc --explain E0046`. |