about summary refs log tree commit diff
path: root/tests/ui/panic-handler
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2024-07-06 20:26:50 +0000
committerbors <bors@rust-lang.org>2024-07-06 20:26:50 +0000
commited7e35f3494045fa1194be29085fa73e2d6dab40 (patch)
tree5dbd26e58a1f27dd18670cd1d22fa0882e6fe2bb /tests/ui/panic-handler
parent8a8ad3433e4168f54ac1364f85da694be9eeca7c (diff)
parent413345c61dc0bf29e259d2cfd50daaaeab008ea8 (diff)
downloadrust-ed7e35f3494045fa1194be29085fa73e2d6dab40.tar.gz
rust-ed7e35f3494045fa1194be29085fa73e2d6dab40.zip
Auto merge of #127430 - compiler-errors:rollup-76ni16s, r=compiler-errors
Rollup of 4 pull requests

Successful merges:

 - #127386 (Uplift outlives components to `rustc_type_ir`)
 - #127405 (uplift `PredicateEmittingRelation`)
 - #127410 (Correct description of E0502)
 - #127417 (Show fnsig's unit output  explicitly when there is output diff in diagnostics)

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'tests/ui/panic-handler')
-rw-r--r--tests/ui/panic-handler/panic-handler-bad-signature-1.stderr2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/ui/panic-handler/panic-handler-bad-signature-1.stderr b/tests/ui/panic-handler/panic-handler-bad-signature-1.stderr
index 812f7a0692f..4fea52fec6e 100644
--- a/tests/ui/panic-handler/panic-handler-bad-signature-1.stderr
+++ b/tests/ui/panic-handler/panic-handler-bad-signature-1.stderr
@@ -5,7 +5,7 @@ LL | fn panic(info: PanicInfo) -> () {}
    |                ^^^^^^^^^ expected `&PanicInfo<'_>`, found `PanicInfo<'_>`
    |
    = note: expected signature `for<'a, 'b> fn(&'a PanicInfo<'b>) -> !`
-              found signature `for<'a> fn(PanicInfo<'a>)`
+              found signature `for<'a> fn(PanicInfo<'a>) -> ()`
 
 error: aborting due to 1 previous error