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

use span instead of div for since version #60515

Merged
merged 1 commit into from
May 6, 2019

Conversation

euclio
Copy link
Contributor

@euclio euclio commented May 3, 2019

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 3, 2019
@GuillaumeGomez
Copy link
Member

@euclio: Looks good, thanks!

@pietroalbini: And what's the excuse here? :p

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented May 4, 2019

📌 Commit 8fc6e42 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 May 4, 2019
Manishearth added a commit to Manishearth/rust that referenced this pull request May 5, 2019
bors added a commit that referenced this pull request May 5, 2019
Rollup of 5 pull requests

Successful merges:

 - #60131 (Fix broken link in rustc_plugin doc)
 - #60426 (Stop `-O`/`-C opt-level` and `-g`/`-C debuginfo` conflicting)
 - #60515 (use span instead of div for since version)
 - #60530 (rustc: rename all occurences of "freevar" to "upvar".)
 - #60536 (Correct code points to match their textual description)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented May 6, 2019

☔ The latest upstream changes (presumably #60567) 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 May 6, 2019
@bors bors merged commit 8fc6e42 into rust-lang:master May 6, 2019
@euclio euclio deleted the div-in-heading branch May 15, 2019 23:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

rustdoc generates HTML with "div" embedded in an h4
4 participants