diff options
| author | Esteban Küber <esteban@kuber.com.ar> | 2019-01-17 22:51:01 -0800 |
|---|---|---|
| committer | Esteban Küber <esteban@kuber.com.ar> | 2019-01-17 22:51:01 -0800 |
| commit | 954769e2ed16a90bfda2b69395fc099b93581352 (patch) | |
| tree | cba061de1cfb21c6e3a74df0fa81642215f8b573 | |
| parent | fbb072837dbbaf30a1e81674b457e5ea816dbca1 (diff) | |
| download | rust-954769e2ed16a90bfda2b69395fc099b93581352.tar.gz rust-954769e2ed16a90bfda2b69395fc099b93581352.zip | |
Fix test after rebase
| -rw-r--r-- | src/test/ui/point-to-type-err-cause-on-impl-trait-return.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/point-to-type-err-cause-on-impl-trait-return.stderr | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/test/ui/point-to-type-err-cause-on-impl-trait-return.rs b/src/test/ui/point-to-type-err-cause-on-impl-trait-return.rs index a27df240d07..95b40368143 100644 --- a/src/test/ui/point-to-type-err-cause-on-impl-trait-return.rs +++ b/src/test/ui/point-to-type-err-cause-on-impl-trait-return.rs @@ -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 } } diff --git a/src/test/ui/point-to-type-err-cause-on-impl-trait-return.stderr b/src/test/ui/point-to-type-err-cause-on-impl-trait-return.stderr index be3d2c0db4c..62da0787b02 100644 --- a/src/test/ui/point-to-type-err-cause-on-impl-trait-return.stderr +++ b/src/test/ui/point-to-type-err-cause-on-impl-trait-return.stderr @@ -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` |