Skip to content

Conversation

eddyb
Copy link
Member

@eddyb eddyb commented Jan 24, 2020

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:

-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.

@rust-highfive
Copy link

r? @Eh2406

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 24, 2020
@Eh2406
Copy link
Contributor

Eh2406 commented Jan 24, 2020

@bors r+ seams reasonable.

@bors
Copy link
Contributor

bors commented Jan 24, 2020

📌 Commit 4d3b738 has been approved by Eh2406

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 24, 2020
@bors
Copy link
Contributor

bors commented Jan 24, 2020

⌛ Testing commit 4d3b738 with merge b68b097...

bors added a commit that referenced this pull request Jan 24, 2020
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.
@bors
Copy link
Contributor

bors commented Jan 24, 2020

☀️ Test successful - checks-azure
Approved by: Eh2406
Pushing b68b097 to master...

@bors bors merged commit 4d3b738 into rust-lang:master Jan 24, 2020
@eddyb eddyb deleted the recursion-limit-diagnostic branch January 24, 2020 18:54
@ehuss ehuss added this to the 1.42.0 milestone Feb 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants