diff options
| author | bors <bors@rust-lang.org> | 2019-01-13 22:20:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-01-13 22:20:43 +0000 |
| commit | 9aee7ed335cfcaad33a6f6492497588b3d421b2d (patch) | |
| tree | dacbbb5fc2990b30e063fd8c0e65a88e556718b9 /src/test/ui/pattern | |
| parent | 2fadb0a16c8737a45746e95df9138912590ed8ad (diff) | |
| parent | 35af111232f887a1173106a2038094c165bee1ff (diff) | |
| download | rust-9aee7ed335cfcaad33a6f6492497588b3d421b2d.tar.gz rust-9aee7ed335cfcaad33a6f6492497588b3d421b2d.zip | |
Auto merge of #57580 - Centril:rollup, r=Centril
Rollup of 4 pull requests Successful merges: - #56874 (Simplify foreign type rendering.) - #57113 (Move diagnostics out from QueryJob and optimize for the case with no diagnostics) - #57366 (Point at match discriminant on type error in match arm pattern) - #57538 (librustc_mir: Fix ICE with slice patterns) Failed merges: - #57381 (Tweak output of type mismatch between "then" and `else` `if` arms) r? @ghost
Diffstat (limited to 'src/test/ui/pattern')
| -rw-r--r-- | src/test/ui/pattern/pattern-error-continue.stderr | 2 | ||||
| -rw-r--r-- | src/test/ui/pattern/pattern-tyvar.stderr | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/test/ui/pattern/pattern-error-continue.stderr b/src/test/ui/pattern/pattern-error-continue.stderr index c17d4b70f0b..c2810d764c2 100644 --- a/src/test/ui/pattern/pattern-error-continue.stderr +++ b/src/test/ui/pattern/pattern-error-continue.stderr @@ -21,6 +21,8 @@ LL | A::B(_, _, _) => (), //~ ERROR this pattern has 3 fields, but error[E0308]: mismatched types --> $DIR/pattern-error-continue.rs:22:9 | +LL | match 'c' { + | --- this match expression has type `char` LL | S { .. } => (), | ^^^^^^^^ expected char, found struct `S` | diff --git a/src/test/ui/pattern/pattern-tyvar.stderr b/src/test/ui/pattern/pattern-tyvar.stderr index dae17fa5166..69cd552aabd 100644 --- a/src/test/ui/pattern/pattern-tyvar.stderr +++ b/src/test/ui/pattern/pattern-tyvar.stderr @@ -1,6 +1,8 @@ error[E0308]: mismatched types --> $DIR/pattern-tyvar.rs:5:18 | +LL | match t { + | - this match expression has type `std::option::Option<std::vec::Vec<isize>>` LL | Bar::T1(_, Some::<isize>(x)) => { //~ ERROR mismatched types | ^^^^^^^^^^^^^^^^ expected struct `std::vec::Vec`, found isize | |