about summary refs log tree commit diff
path: root/src/tools/clippy/tests/ui/crashes
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-11-14 18:03:17 +0000
committerbors <bors@rust-lang.org>2020-11-14 18:03:17 +0000
commit98d66340d6e63eda115afc8b0da1d87965881936 (patch)
tree96ad525be05173c8af11a088b5c55f9c4afa530a /src/tools/clippy/tests/ui/crashes
parent30e49a9ead550551e879af64ba91a0316da1c422 (diff)
parentf026d0fcf804b71614a6aa070e34a0b42f5469d2 (diff)
downloadrust-98d66340d6e63eda115afc8b0da1d87965881936.tar.gz
rust-98d66340d6e63eda115afc8b0da1d87965881936.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`
Diffstat (limited to 'src/tools/clippy/tests/ui/crashes')
-rw-r--r--src/tools/clippy/tests/ui/crashes/ice-6252.stderr18
1 files changed, 2 insertions, 16 deletions
diff --git a/src/tools/clippy/tests/ui/crashes/ice-6252.stderr b/src/tools/clippy/tests/ui/crashes/ice-6252.stderr
index 440973e2439..eaa5e6f51cb 100644
--- a/src/tools/clippy/tests/ui/crashes/ice-6252.stderr
+++ b/src/tools/clippy/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`.