Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rustdoc: Avoid panic when parsing codeblocks for playground links #67818

Merged
merged 1 commit into from
Jan 5, 2020

Conversation

ollie27
Copy link
Member

@ollie27 ollie27 commented Jan 2, 2020

make_test is also called when parsing codeblocks for the playground links so it should handle unwinds from the parser internally.

Fixes #63016

r? @GuillaumeGomez

@GuillaumeGomez
Copy link
Member

Nice, thanks!

@bors: r+

@bors
Copy link
Contributor

bors commented Jan 3, 2020

📌 Commit d0e0404b055fd2dce70ab71a2a883559f14e98f0 has been approved by GuillaumeGomez

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 3, 2020
@bors
Copy link
Contributor

bors commented Jan 4, 2020

☔ The latest upstream changes (presumably #67853) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 4, 2020
`make_test` is also called when parsing codeblocks for the playground links so it should handle unwinds from the parser internally.
@ollie27 ollie27 force-pushed the rustdoc_playground_syntax_error branch from d0e0404 to efb876f Compare January 4, 2020 18:42
@ollie27
Copy link
Member Author

ollie27 commented Jan 4, 2020

@bors r=GuillaumeGomez

@bors
Copy link
Contributor

bors commented Jan 4, 2020

📌 Commit efb876f has been approved by GuillaumeGomez

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 4, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Jan 5, 2020
…rror, r=GuillaumeGomez

rustdoc: Avoid panic when parsing codeblocks for playground links

`make_test` is also called when parsing codeblocks for the playground links so it should handle unwinds from the parser internally.

Fixes rust-lang#63016

r? @GuillaumeGomez
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Jan 5, 2020
…rror, r=GuillaumeGomez

rustdoc: Avoid panic when parsing codeblocks for playground links

`make_test` is also called when parsing codeblocks for the playground links so it should handle unwinds from the parser internally.

Fixes rust-lang#63016

r? @GuillaumeGomez
bors added a commit that referenced this pull request Jan 5, 2020
Rollup of 5 pull requests

Successful merges:

 - #67818 (rustdoc: Avoid panic when parsing codeblocks for playground links)
 - #67845 (Also remove const-hack for abs)
 - #67879 (Remove negative number check from float sqrt)
 - #67881 (Add backticks to various diagnostics)
 - #67882 (remove bespoke flock bindings)

Failed merges:

r? @ghost
@bors bors merged commit efb876f into rust-lang:master Jan 5, 2020
@ollie27 ollie27 deleted the rustdoc_playground_syntax_error branch January 5, 2020 23:40
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.

rustdoc silently fails parsing some doctests when using a playground URL
3 participants