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.

Sign up for GitHub

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

Jump to bottom

rustdoc: HTML escape codeblocks which fail syntax highlighting #68263

Merged
merged 1 commit into from
Jan 16, 2020
Merged

rustdoc: HTML escape codeblocks which fail syntax highlighting #68263

merged 1 commit into from
Jan 16, 2020

Conversation

ollie27
Copy link
Member

@ollie27 ollie27 commented Jan 15, 2020

@JohnTitor JohnTitor added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 16, 2020
@GuillaumeGomez
Copy link
Member

Thanks!

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented Jan 16, 2020

📌 Commit baf2921 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-review Status: Awaiting review from the assignee but also interested parties. labels Jan 16, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Jan 16, 2020
@Dylan-DPC
Rollup merge of rust-lang#68263 - ollie27:rustdoc_invalid_syntax_high…
6e797ff 
…light_escape, r=GuillaumeGomez

rustdoc: HTML escape codeblocks which fail syntax highlighting

r? @GuillaumeGomez
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Jan 16, 2020
Merged
bors added a commit that referenced this pull request Jan 16, 2020
@bors
Auto merge of #68286 - Dylan-DPC:rollup-x7ssgov, r=Dylan-DPC
4884061 
Rollup of 5 pull requests

Successful merges:

 - #68033 (Don't use f64 shims for f32 cmath functions on non 32-bit x86 MSVC)
 - #68244 (Enable leak sanitizer test case)
 - #68255 (Remove unused auxiliary file that was replaced with rust_test_helpers)
 - #68263 (rustdoc: HTML escape codeblocks which fail syntax highlighting)
 - #68274 (remove dead code)

Failed merges:

r? @ghost
@bors bors merged commit baf2921 into rust-lang:master Jan 16, 2020
@ollie27 ollie27 deleted the rustdoc_invalid_syntax_highlight_escape branch January 16, 2020 22:55
@jyn514 jyn514 added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Oct 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@GuillaumeGomez GuillaumeGomez

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@ollie27 @GuillaumeGomez @bors @jyn514 @JohnTitor