Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

85 files changed, 17 insertions, 2 deletions

diff --git a/src/test/ui/match/auxiliary/match_non_exhaustive_lib.rs b/tests/ui/match/auxiliary/match_non_exhaustive_lib.rs
index 3be72551e..3be72551e 100644
--- a/src/test/ui/match/auxiliary/match_non_exhaustive_lib.rs
+++ b/tests/ui/match/auxiliary/match_non_exhaustive_lib.rs
diff --git a/src/test/ui/match/const_non_normal_zst_ref_pattern.rs b/tests/ui/match/const_non_normal_zst_ref_pattern.rs
index a114fafb6..a114fafb6 100644
--- a/src/test/ui/match/const_non_normal_zst_ref_pattern.rs
+++ b/tests/ui/match/const_non_normal_zst_ref_pattern.rs
diff --git a/src/test/ui/match/expr-match-panic-fn.rs b/tests/ui/match/expr-match-panic-fn.rs
index ea471717e..ea471717e 100644
--- a/src/test/ui/match/expr-match-panic-fn.rs
+++ b/tests/ui/match/expr-match-panic-fn.rs
diff --git a/src/test/ui/match/expr-match-panic.rs b/tests/ui/match/expr-match-panic.rs
index 53f8a8bd3..53f8a8bd3 100644
--- a/src/test/ui/match/expr-match-panic.rs
+++ b/tests/ui/match/expr-match-panic.rs
diff --git a/src/test/ui/match/expr_before_ident_pat.rs b/tests/ui/match/expr_before_ident_pat.rs
index 27ef3d05a..27ef3d05a 100644
--- a/src/test/ui/match/expr_before_ident_pat.rs
+++ b/tests/ui/match/expr_before_ident_pat.rs
diff --git a/src/test/ui/match/expr_before_ident_pat.stderr b/tests/ui/match/expr_before_ident_pat.stderr
index 57a2d2b26..57a2d2b26 100644
--- a/src/test/ui/match/expr_before_ident_pat.stderr
+++ b/tests/ui/match/expr_before_ident_pat.stderr
diff --git a/src/test/ui/match/guards.rs b/tests/ui/match/guards.rs
index 10a4bb673..10a4bb673 100644
--- a/src/test/ui/match/guards.rs
+++ b/tests/ui/match/guards.rs
diff --git a/src/test/ui/match/issue-11319.rs b/tests/ui/match/issue-11319.rs
index ab69ab250..ab69ab250 100644
--- a/src/test/ui/match/issue-11319.rs
+++ b/tests/ui/match/issue-11319.rs
diff --git a/src/test/ui/match/issue-11319.stderr b/tests/ui/match/issue-11319.stderr
index fc44205e8..fc44205e8 100644
--- a/src/test/ui/match/issue-11319.stderr
+++ b/tests/ui/match/issue-11319.stderr
diff --git a/src/test/ui/match/issue-11940.rs b/tests/ui/match/issue-11940.rs
index 6815c87ed..6815c87ed 100644
--- a/src/test/ui/match/issue-11940.rs
+++ b/tests/ui/match/issue-11940.rs
diff --git a/src/test/ui/match/issue-12552.rs b/tests/ui/match/issue-12552.rs
index b7f71dd1c..b7f71dd1c 100644
--- a/src/test/ui/match/issue-12552.rs
+++ b/tests/ui/match/issue-12552.rs
diff --git a/src/test/ui/match/issue-12552.stderr b/tests/ui/match/issue-12552.stderr
index 4b027eba2..4b027eba2 100644
--- a/src/test/ui/match/issue-12552.stderr
+++ b/tests/ui/match/issue-12552.stderr
diff --git a/src/test/ui/match/issue-18060.rs b/tests/ui/match/issue-18060.rs
index b5f3d0f74..b5f3d0f74 100644
--- a/src/test/ui/match/issue-18060.rs
+++ b/tests/ui/match/issue-18060.rs
diff --git a/src/test/ui/match/issue-26251.rs b/tests/ui/match/issue-26251.rs
index a3e26a412..a3e26a412 100644
--- a/src/test/ui/match/issue-26251.rs
+++ b/tests/ui/match/issue-26251.rs
diff --git a/src/test/ui/match/issue-26996.rs b/tests/ui/match/issue-26996.rs
index 84037b72a..84037b72a 100644
--- a/src/test/ui/match/issue-26996.rs
+++ b/tests/ui/match/issue-26996.rs
diff --git a/src/test/ui/match/issue-27021.rs b/tests/ui/match/issue-27021.rs
index ef3b114a5..ef3b114a5 100644
--- a/src/test/ui/match/issue-27021.rs
+++ b/tests/ui/match/issue-27021.rs
diff --git a/src/test/ui/match/issue-33498.rs b/tests/ui/match/issue-33498.rs
index 9c8a97e7e..9c8a97e7e 100644
--- a/src/test/ui/match/issue-33498.rs
+++ b/tests/ui/match/issue-33498.rs
diff --git a/src/test/ui/match/issue-41255.rs b/tests/ui/match/issue-41255.rs
index d163801fd..d163801fd 100644
--- a/src/test/ui/match/issue-41255.rs
+++ b/tests/ui/match/issue-41255.rs
diff --git a/src/test/ui/match/issue-41255.stderr b/tests/ui/match/issue-41255.stderr
index 9bc49654e..9bc49654e 100644
--- a/src/test/ui/match/issue-41255.stderr
+++ b/tests/ui/match/issue-41255.stderr
diff --git a/src/test/ui/match/issue-42679.rs b/tests/ui/match/issue-42679.rs
index 46a0bd35d..46a0bd35d 100644
--- a/src/test/ui/match/issue-42679.rs
+++ b/tests/ui/match/issue-42679.rs
diff --git a/src/test/ui/match/issue-46920-byte-array-patterns.rs b/tests/ui/match/issue-46920-byte-array-patterns.rs
index 2a8b4bb49..2a8b4bb49 100644
--- a/src/test/ui/match/issue-46920-byte-array-patterns.rs
+++ b/tests/ui/match/issue-46920-byte-array-patterns.rs
diff --git a/src/test/ui/issues/issue-5530.rs b/tests/ui/match/issue-5530.rs
index 72731cbb1..72731cbb1 100644
--- a/src/test/ui/issues/issue-5530.rs
+++ b/tests/ui/match/issue-5530.rs
diff --git a/src/test/ui/match/issue-56685.rs b/tests/ui/match/issue-56685.rs
index f320c99ed..f320c99ed 100644
--- a/src/test/ui/match/issue-56685.rs
+++ b/tests/ui/match/issue-56685.rs
diff --git a/src/test/ui/match/issue-56685.stderr b/tests/ui/match/issue-56685.stderr
index ccf357d4a..ccf357d4a 100644
--- a/src/test/ui/match/issue-56685.stderr
+++ b/tests/ui/match/issue-56685.stderr
diff --git a/src/test/ui/match/issue-70972-dyn-trait.rs b/tests/ui/match/issue-70972-dyn-trait.rs
index 97d161c59..97d161c59 100644
--- a/src/test/ui/match/issue-70972-dyn-trait.rs
+++ b/tests/ui/match/issue-70972-dyn-trait.rs
diff --git a/src/test/ui/match/issue-70972-dyn-trait.stderr b/tests/ui/match/issue-70972-dyn-trait.stderr
index 7581070eb..7581070eb 100644
--- a/src/test/ui/match/issue-70972-dyn-trait.stderr
+++ b/tests/ui/match/issue-70972-dyn-trait.stderr
diff --git a/src/test/ui/match/issue-72680.rs b/tests/ui/match/issue-72680.rs
index c13cace76..c13cace76 100644
--- a/src/test/ui/match/issue-72680.rs
+++ b/tests/ui/match/issue-72680.rs
diff --git a/src/test/ui/match/issue-72896.rs b/tests/ui/match/issue-72896.rs
index 3a8b82037..3a8b82037 100644
--- a/src/test/ui/match/issue-72896.rs
+++ b/tests/ui/match/issue-72896.rs
diff --git a/src/test/ui/match/issue-74050-end-span.rs b/tests/ui/match/issue-74050-end-span.rs
index cc81214e2..cc81214e2 100644
--- a/src/test/ui/match/issue-74050-end-span.rs
+++ b/tests/ui/match/issue-74050-end-span.rs
diff --git a/src/test/ui/match/issue-74050-end-span.stderr b/tests/ui/match/issue-74050-end-span.stderr
index 59c091e44..59c091e44 100644
--- a/src/test/ui/match/issue-74050-end-span.stderr
+++ b/tests/ui/match/issue-74050-end-span.stderr
diff --git a/src/test/ui/match/issue-82392.rs b/tests/ui/match/issue-82392.rs
index d26d88304..d26d88304 100644
--- a/src/test/ui/match/issue-82392.rs
+++ b/tests/ui/match/issue-82392.rs
diff --git a/src/test/ui/match/issue-82392.stdout b/tests/ui/match/issue-82392.stdout
index ffe730743..ffe730743 100644
--- a/src/test/ui/match/issue-82392.stdout
+++ b/tests/ui/match/issue-82392.stdout
diff --git a/src/test/ui/match/issue-82866.rs b/tests/ui/match/issue-82866.rs
index 95cd62261..95cd62261 100644
--- a/src/test/ui/match/issue-82866.rs
+++ b/tests/ui/match/issue-82866.rs
diff --git a/src/test/ui/match/issue-82866.stderr b/tests/ui/match/issue-82866.stderr
index f9e3360a5..f9e3360a5 100644
--- a/src/test/ui/match/issue-82866.stderr
+++ b/tests/ui/match/issue-82866.stderr
diff --git a/src/test/ui/match/issue-84434.rs b/tests/ui/match/issue-84434.rs
index 423481fd5..423481fd5 100644
--- a/src/test/ui/match/issue-84434.rs
+++ b/tests/ui/match/issue-84434.rs
diff --git a/src/test/ui/match/issue-91058.rs b/tests/ui/match/issue-91058.rs
index 4845937d5..4845937d5 100644
--- a/src/test/ui/match/issue-91058.rs
+++ b/tests/ui/match/issue-91058.rs
diff --git a/src/test/ui/match/issue-91058.stderr b/tests/ui/match/issue-91058.stderr
index ec1d7e21f..ec1d7e21f 100644
--- a/src/test/ui/match/issue-91058.stderr
+++ b/tests/ui/match/issue-91058.stderr
diff --git a/src/test/ui/match/issue-92100.rs b/tests/ui/match/issue-92100.rs
index baac570dd..baac570dd 100644
--- a/src/test/ui/match/issue-92100.rs
+++ b/tests/ui/match/issue-92100.rs
diff --git a/src/test/ui/match/issue-92100.stderr b/tests/ui/match/issue-92100.stderr
index 0f694c587..0f694c587 100644
--- a/src/test/ui/match/issue-92100.stderr
+++ b/tests/ui/match/issue-92100.stderr
diff --git a/src/test/ui/match/match-arm-resolving-to-never.rs b/tests/ui/match/match-arm-resolving-to-never.rs
index 6ef249c05..6ef249c05 100644
--- a/src/test/ui/match/match-arm-resolving-to-never.rs
+++ b/tests/ui/match/match-arm-resolving-to-never.rs
diff --git a/src/test/ui/match/match-arm-resolving-to-never.stderr b/tests/ui/match/match-arm-resolving-to-never.stderr
index 686fbd0ba..686fbd0ba 100644
--- a/src/test/ui/match/match-arm-resolving-to-never.stderr
+++ b/tests/ui/match/match-arm-resolving-to-never.stderr
diff --git a/src/test/ui/match/match-bot-panic.rs b/tests/ui/match/match-bot-panic.rs
index e4a6f6d6f..e4a6f6d6f 100644
--- a/src/test/ui/match/match-bot-panic.rs
+++ b/tests/ui/match/match-bot-panic.rs
diff --git a/src/test/ui/match/match-disc-bot.rs b/tests/ui/match/match-disc-bot.rs
index 18cfd5e23..18cfd5e23 100644
--- a/src/test/ui/match/match-disc-bot.rs
+++ b/tests/ui/match/match-disc-bot.rs
diff --git a/src/test/ui/match/match-fn-call.rs b/tests/ui/match/match-fn-call.rs
index 99092602c..99092602c 100644
--- a/src/test/ui/match/match-fn-call.rs
+++ b/tests/ui/match/match-fn-call.rs
diff --git a/src/test/ui/match/match-fn-call.stderr b/tests/ui/match/match-fn-call.stderr
index 297aa4cd9..297aa4cd9 100644
--- a/src/test/ui/match/match-fn-call.stderr
+++ b/tests/ui/match/match-fn-call.stderr
diff --git a/src/test/ui/match/match-ill-type2.rs b/tests/ui/match/match-ill-type2.rs
index 6612f6e39..6612f6e39 100644
--- a/src/test/ui/match/match-ill-type2.rs
+++ b/tests/ui/match/match-ill-type2.rs
diff --git a/src/test/ui/match/match-ill-type2.stderr b/tests/ui/match/match-ill-type2.stderr
index 5078f03d6..5078f03d6 100644
--- a/src/test/ui/match/match-ill-type2.stderr
+++ b/tests/ui/match/match-ill-type2.stderr
diff --git a/src/test/ui/match/match-incompat-type-semi.rs b/tests/ui/match/match-incompat-type-semi.rs
index 37f6beabd..37f6beabd 100644
--- a/src/test/ui/match/match-incompat-type-semi.rs
+++ b/tests/ui/match/match-incompat-type-semi.rs
diff --git a/src/test/ui/match/match-incompat-type-semi.stderr b/tests/ui/match/match-incompat-type-semi.stderr
index 008b1c1e9..008b1c1e9 100644
--- a/src/test/ui/match/match-incompat-type-semi.stderr
+++ b/tests/ui/match/match-incompat-type-semi.stderr
diff --git a/src/test/ui/match/match-join.rs b/tests/ui/match/match-join.rs
index b0f2593c8..b0f2593c8 100644
--- a/src/test/ui/match/match-join.rs
+++ b/tests/ui/match/match-join.rs
diff --git a/src/test/ui/match/match-join.stderr b/tests/ui/match/match-join.stderr
index 27a82c124..27a82c124 100644
--- a/src/test/ui/match/match-join.stderr
+++ b/tests/ui/match/match-join.stderr
diff --git a/src/test/ui/match/match-no-arms-unreachable-after.rs b/tests/ui/match/match-no-arms-unreachable-after.rs
index 8f83fd1a3..8f83fd1a3 100644
--- a/src/test/ui/match/match-no-arms-unreachable-after.rs
+++ b/tests/ui/match/match-no-arms-unreachable-after.rs
diff --git a/src/test/ui/match/match-no-arms-unreachable-after.stderr b/tests/ui/match/match-no-arms-unreachable-after.stderr
index a0a369726..a0a369726 100644
--- a/src/test/ui/match/match-no-arms-unreachable-after.stderr
+++ b/tests/ui/match/match-no-arms-unreachable-after.stderr
diff --git a/src/test/ui/match/match-on-negative-integer-ranges.rs b/tests/ui/match/match-on-negative-integer-ranges.rs
index 53e9ea9a5..53e9ea9a5 100644
--- a/src/test/ui/match/match-on-negative-integer-ranges.rs
+++ b/tests/ui/match/match-on-negative-integer-ranges.rs
diff --git a/src/test/ui/match/match-pattern-field-mismatch-2.rs b/tests/ui/match/match-pattern-field-mismatch-2.rs
index fa03cdac2..fa03cdac2 100644
--- a/src/test/ui/match/match-pattern-field-mismatch-2.rs
+++ b/tests/ui/match/match-pattern-field-mismatch-2.rs
diff --git a/src/test/ui/match/match-pattern-field-mismatch-2.stderr b/tests/ui/match/match-pattern-field-mismatch-2.stderr
index ba32d0e99..ba32d0e99 100644
--- a/src/test/ui/match/match-pattern-field-mismatch-2.stderr
+++ b/tests/ui/match/match-pattern-field-mismatch-2.stderr
diff --git a/src/test/ui/match/match-pattern-field-mismatch.rs b/tests/ui/match/match-pattern-field-mismatch.rs
index a4fa97fef..a4fa97fef 100644
--- a/src/test/ui/match/match-pattern-field-mismatch.rs
+++ b/tests/ui/match/match-pattern-field-mismatch.rs
diff --git a/src/test/ui/match/match-pattern-field-mismatch.stderr b/tests/ui/match/match-pattern-field-mismatch.stderr
index c994ee4f6..c994ee4f6 100644
--- a/src/test/ui/match/match-pattern-field-mismatch.stderr
+++ b/tests/ui/match/match-pattern-field-mismatch.stderr
diff --git a/src/test/ui/match/match-range-fail-2.rs b/tests/ui/match/match-range-fail-2.rs
index 792664e1d..792664e1d 100644
--- a/src/test/ui/match/match-range-fail-2.rs
+++ b/tests/ui/match/match-range-fail-2.rs
diff --git a/src/test/ui/match/match-range-fail-2.stderr b/tests/ui/match/match-range-fail-2.stderr
index 7a0852d7e..7a0852d7e 100644
--- a/src/test/ui/match/match-range-fail-2.stderr
+++ b/tests/ui/match/match-range-fail-2.stderr
diff --git a/src/test/ui/match/match-range-fail.rs b/tests/ui/match/match-range-fail.rs
index e53c8463e..e53c8463e 100644
--- a/src/test/ui/match/match-range-fail.rs
+++ b/tests/ui/match/match-range-fail.rs
diff --git a/src/test/ui/match/match-range-fail.stderr b/tests/ui/match/match-range-fail.stderr
index 65db92df1..65db92df1 100644
--- a/src/test/ui/match/match-range-fail.stderr
+++ b/tests/ui/match/match-range-fail.stderr
diff --git a/src/test/ui/match/match-ref-mut-invariance.rs b/tests/ui/match/match-ref-mut-invariance.rs
index 4250696c6..4250696c6 100644
--- a/src/test/ui/match/match-ref-mut-invariance.rs
+++ b/tests/ui/match/match-ref-mut-invariance.rs
diff --git a/src/test/ui/match/match-ref-mut-invariance.stderr b/tests/ui/match/match-ref-mut-invariance.stderr
index 3b7e53cd5..3b7e53cd5 100644
--- a/src/test/ui/match/match-ref-mut-invariance.stderr
+++ b/tests/ui/match/match-ref-mut-invariance.stderr
diff --git a/src/test/ui/match/match-ref-mut-let-invariance.rs b/tests/ui/match/match-ref-mut-let-invariance.rs
index a33be09ac..a33be09ac 100644
--- a/src/test/ui/match/match-ref-mut-let-invariance.rs
+++ b/tests/ui/match/match-ref-mut-let-invariance.rs
diff --git a/src/test/ui/match/match-ref-mut-let-invariance.stderr b/tests/ui/match/match-ref-mut-let-invariance.stderr
index f4d1cea67..f4d1cea67 100644
--- a/src/test/ui/match/match-ref-mut-let-invariance.stderr
+++ b/tests/ui/match/match-ref-mut-let-invariance.stderr
diff --git a/src/test/ui/match/match-ref-mut-stability.rs b/tests/ui/match/match-ref-mut-stability.rs
index 52120360b..52120360b 100644
--- a/src/test/ui/match/match-ref-mut-stability.rs
+++ b/tests/ui/match/match-ref-mut-stability.rs
diff --git a/src/test/ui/match/match-struct.rs b/tests/ui/match/match-struct.rs
index 7a54c54b9..7a54c54b9 100644
--- a/src/test/ui/match/match-struct.rs
+++ b/tests/ui/match/match-struct.rs
diff --git a/src/test/ui/match/match-struct.stderr b/tests/ui/match/match-struct.stderr
index a475bd5e5..a475bd5e5 100644
--- a/src/test/ui/match/match-struct.stderr
+++ b/tests/ui/match/match-struct.stderr
diff --git a/src/test/ui/match/match-tag-nullary.rs b/tests/ui/match/match-tag-nullary.rs
index bb2f59969..bb2f59969 100644
--- a/src/test/ui/match/match-tag-nullary.rs
+++ b/tests/ui/match/match-tag-nullary.rs
diff --git a/src/test/ui/match/match-tag-nullary.stderr b/tests/ui/match/match-tag-nullary.stderr
index a6add31d1..a6add31d1 100644
--- a/src/test/ui/match/match-tag-nullary.stderr
+++ b/tests/ui/match/match-tag-nullary.stderr
diff --git a/src/test/ui/match/match-tag-unary.rs b/tests/ui/match/match-tag-unary.rs
index aedceafb4..aedceafb4 100644
--- a/src/test/ui/match/match-tag-unary.rs
+++ b/tests/ui/match/match-tag-unary.rs
diff --git a/src/test/ui/match/match-tag-unary.stderr b/tests/ui/match/match-tag-unary.stderr
index 31f77bdff..31f77bdff 100644
--- a/src/test/ui/match/match-tag-unary.stderr
+++ b/tests/ui/match/match-tag-unary.stderr
diff --git a/src/test/ui/match/match-type-err-first-arm.rs b/tests/ui/match/match-type-err-first-arm.rs
index e9027eb24..e9027eb24 100644
--- a/src/test/ui/match/match-type-err-first-arm.rs
+++ b/tests/ui/match/match-type-err-first-arm.rs
diff --git a/src/test/ui/match/match-type-err-first-arm.stderr b/tests/ui/match/match-type-err-first-arm.stderr
index 1cfe7ce1e..1cfe7ce1e 100644
--- a/src/test/ui/match/match-type-err-first-arm.stderr
+++ b/tests/ui/match/match-type-err-first-arm.stderr
diff --git a/src/test/ui/match/match-unresolved-one-arm.rs b/tests/ui/match/match-unresolved-one-arm.rs
index fa65d87b3..fa65d87b3 100644
--- a/src/test/ui/match/match-unresolved-one-arm.rs
+++ b/tests/ui/match/match-unresolved-one-arm.rs
diff --git a/src/test/ui/match/match-unresolved-one-arm.stderr b/tests/ui/match/match-unresolved-one-arm.stderr
index 9eadb88a8..e3b501b2f 100644
--- a/src/test/ui/match/match-unresolved-one-arm.stderr
+++ b/tests/ui/match/match-unresolved-one-arm.stderr
@@ -6,8 +6,8 @@ LL |     let x = match () {
    |
 help: consider giving `x` an explicit type
    |
-LL |     let x: _ = match () {
-   |          +++
+LL |     let x: /* Type */ = match () {
+   |          ++++++++++++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/match/match-vec-mismatch-2.rs b/tests/ui/match/match-vec-mismatch-2.rs
index 553095837..553095837 100644
--- a/src/test/ui/match/match-vec-mismatch-2.rs
+++ b/tests/ui/match/match-vec-mismatch-2.rs
diff --git a/src/test/ui/match/match-vec-mismatch-2.stderr b/tests/ui/match/match-vec-mismatch-2.stderr
index 5247bea62..5247bea62 100644
--- a/src/test/ui/match/match-vec-mismatch-2.stderr
+++ b/tests/ui/match/match-vec-mismatch-2.stderr
diff --git a/src/test/ui/match/match-wildcards.rs b/tests/ui/match/match-wildcards.rs
index 43f6e4913..43f6e4913 100644
--- a/src/test/ui/match/match-wildcards.rs
+++ b/tests/ui/match/match-wildcards.rs
diff --git a/src/test/ui/match/match_non_exhaustive.rs b/tests/ui/match/match_non_exhaustive.rs
index f162dd60f..f162dd60f 100644
--- a/src/test/ui/match/match_non_exhaustive.rs
+++ b/tests/ui/match/match_non_exhaustive.rs
diff --git a/src/test/ui/match/match_non_exhaustive.stderr b/tests/ui/match/match_non_exhaustive.stderr
index 46ee8d517..46ee8d517 100644
--- a/src/test/ui/match/match_non_exhaustive.stderr
+++ b/tests/ui/match/match_non_exhaustive.stderr
diff --git a/src/test/ui/match/pattern-deref-miscompile.rs b/tests/ui/match/pattern-deref-miscompile.rs
index caa6d184a..caa6d184a 100644
--- a/src/test/ui/match/pattern-deref-miscompile.rs
+++ b/tests/ui/match/pattern-deref-miscompile.rs
diff --git a/tests/ui/match/single-line.rs b/tests/ui/match/single-line.rs
new file mode 100644
index 000000000..0f69d089f
--- /dev/null
+++ b/tests/ui/match/single-line.rs
@@ -0,0 +1,3 @@
+fn main() {
+    let _ = match Some(42) { Some(x) => x, None => "" }; //~ ERROR E0308
+}
diff --git a/tests/ui/match/single-line.stderr b/tests/ui/match/single-line.stderr
new file mode 100644
index 000000000..ec3b76e3f
--- /dev/null
+++ b/tests/ui/match/single-line.stderr
@@ -0,0 +1,12 @@
+error[E0308]: `match` arms have incompatible types
+  --> $DIR/single-line.rs:2:52
+   |
+LL |     let _ = match Some(42) { Some(x) => x, None => "" };
+   |             --------------              -          ^^ expected integer, found `&str`
+   |             |                           |
+   |             |                           this is found to be of type `{integer}`
+   |             `match` arms have incompatible types
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.