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

Fix test after rebase

Browse source
This commit is contained in:
Esteban Küber 2019-01-17 22:51:01 -08:00
parent fbb072837d
commit 954769e2ed
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/test/ui/point-to-type-err-cause-on-impl-trait-return.rs
View file

@ -26,10 +26,10 @@ fn baz() -> impl std::fmt::Display {
fn qux() -> impl std::fmt::Display {
if false {
//~^ ERROR if and else have incompatible types
0i32
} else {
1u32
//~^ ERROR if and else have incompatible types
}
}

8
src/test/ui/point-to-type-err-cause-on-impl-trait-return.stderr
View file

@ -38,15 +38,17 @@ LL | | }
found type `u32`
error[E0308]: if and else have incompatible types
--> $DIR/point-to-type-err-cause-on-impl-trait-return.rs:28:5
--> $DIR/point-to-type-err-cause-on-impl-trait-return.rs:31:9
|
LL | / if false {
LL | | //~^ ERROR if and else have incompatible types
LL | | 0i32
| | ---- expected because of this
LL | | } else {
LL | | 1u32
| | ^^^^ expected i32, found u32
LL | | //~^ ERROR if and else have incompatible types
LL | | }
| |_____^ expected i32, found u32
| |_____- if and else have incompatible types
|
= note: expected type `i32`
found type `u32`