user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rollup merge of #64049 - estebank:if-else-type-err, r=Centril

Browse source 
Emit a single error on if expr with expectation and no else clause

Fix https://github.com/rust-lang/rust/issues/60254.

r? @Centril
This commit is contained in:
Mazdak Farrokhzad 2019-09-03 14:26:58 +02:00 • committed by GitHub
commit 4245be7fb3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 30 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/test/ui/issues/issue-50577.rs
View file

@ -2,6 +2,5 @@ fn main() {
enum Foo {
Drop = assert_eq!(1, 1)
//~^ ERROR if may be missing an else clause
//~| ERROR mismatched types [E0308]
}
}

15
src/test/ui/issues/issue-50577.stderr
View file

@ -1,13 +1,3 @@
error[E0308]: mismatched types
--> $DIR/issue-50577.rs:3:16
|
LL | Drop = assert_eq!(1, 1)
| ^^^^^^^^^^^^^^^^ expected isize, found ()
|
= note: expected type `isize`
found type `()`
= note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
error[E0317]: if may be missing an else clause
--> $DIR/issue-50577.rs:3:16
|
@ -23,7 +13,6 @@ LL | Drop = assert_eq!(1, 1)
= help: consider adding an `else` block that evaluates to the expected type
= note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
error: aborting due to 2 previous errors
error: aborting due to previous error
Some errors have detailed explanations: E0308, E0317.
For more information about an error, try `rustc --explain E0308`.
For more information about this error, try `rustc --explain E0317`.