Skip to content

Commit b68b097

Browse files
committed
Auto merge of #7826 - eddyb:recursion-limit-diagnostic, r=Eh2406
test: allow some flexibility in check::error_from_deep_recursion's expected diagnostic. This should unblock rust-lang/rust#68407, by loosening the expected output pattern. As per rust-lang/rust#68407 (comment), this is the change in the diagnostic: ```diff -recursion limit reached while expanding the macro `m` +recursion limit reached while expanding `m!` ``` Ideally I would use something like this regex: ``` recursion limit reached while expanding (the macro `m`|`m!`) ``` but AFAIK these tests don't support regexes.
2 parents 6de33f0 + 4d3b738 commit b68b097

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

tests/testsuite/check.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -766,7 +766,7 @@ fn error_from_deep_recursion() -> Result<(), fmt::Error> {
766766
p.cargo("check --message-format=json")
767767
.with_status(101)
768768
.with_stdout_contains(
769-
"[..]\"message\":\"recursion limit reached while expanding the macro `m`\"[..]",
769+
"[..]\"message\":\"recursion limit reached while expanding [..]`m[..]`\"[..]",
770770
)
771771
.run();
772772

0 commit comments

Comments
 (0)