Skip to content

Commit 954769e

Browse files
committed
Fix test after rebase
1 parent fbb0728 commit 954769e

2 files changed

+6
-4
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ fn baz() -> impl std::fmt::Display {
2626

2727
fn qux() -> impl std::fmt::Display {
2828
if false {
29-
//~^ ERROR if and else have incompatible types
3029
0i32
3130
} else {
3231
1u32
32+
//~^ ERROR if and else have incompatible types
3333
}
3434
}
3535

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

+5-3
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,17 @@ LL | | }
3838
found type `u32`
3939

4040
error[E0308]: if and else have incompatible types
41-
--> $DIR/point-to-type-err-cause-on-impl-trait-return.rs:28:5
41+
--> $DIR/point-to-type-err-cause-on-impl-trait-return.rs:31:9
4242
|
4343
LL | / if false {
44-
LL | | //~^ ERROR if and else have incompatible types
4544
LL | | 0i32
45+
| | ---- expected because of this
4646
LL | | } else {
4747
LL | | 1u32
48+
| | ^^^^ expected i32, found u32
49+
LL | | //~^ ERROR if and else have incompatible types
4850
LL | | }
49-
| |_____^ expected i32, found u32
51+
| |_____- if and else have incompatible types
5052
|
5153
= note: expected type `i32`
5254
found type `u32`

0 commit comments

Comments
 (0)