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

Fix some rustdoc warnings #46853

Merged
merged 1 commit into from
Dec 21, 2017
Merged

Conversation

GuillaumeGomez
Copy link
Member

@QuietMisdreavus
Copy link
Member

Waited long enough to make sure that there were no warnings when travis rendered the docs.

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Dec 19, 2017

📌 Commit 0f1f2d6 has been approved by QuietMisdreavus

@GuillaumeGomez
Copy link
Member Author

Travis failed. I suppose it's a dead link.

@bors: r-

@kennytm kennytm added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Dec 20, 2017
@GuillaumeGomez
Copy link
Member Author

Updated.

@QuietMisdreavus
Copy link
Member

r=me pending travis

@kennytm kennytm added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 20, 2017
@kennytm
Copy link
Member

kennytm commented Dec 20, 2017

@bors r=QuietMisdreavus

@bors
Copy link
Contributor

bors commented Dec 20, 2017

📌 Commit 8835289 has been approved by QuietMisdreavus

@kennytm kennytm 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 Dec 20, 2017
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Dec 21, 2017
bors added a commit that referenced this pull request Dec 21, 2017
Rollup of 5 pull requests

- Successful merges: #46827, #46853, #46860, #46861, #46887
- Failed merges:
@bors bors merged commit 8835289 into rust-lang:master Dec 21, 2017
@GuillaumeGomez GuillaumeGomez deleted the fix-rustdoc-warning branch December 22, 2017 10:56
bors added a commit that referenced this pull request Dec 29, 2017
rustdoc: add option to abort the process on markdown differences

In the efforts of keeping the std docs free of markdown warnings, this PR adds a stopgap measure to make sure the CI fails if it detects a markdown difference. It does this by adding a new unstable flag to rustdoc, `--deny-render-differences`, which bootstrap then passes to rustdoc when documenting std and friends.

The implementation is... probably not the cleanest option. It currently adds an extra branch after it prints the markdown warnings, which just prints a final line and calls `::std::process::abort(1)`. I did it like this because if it just panics regularly, it looks like an ICE, an even though `html::render::run` returns a Result, that Result is also just `expect`ed immediately, generating the same problem. This way bypasses the panic handler at the top of the thread and looks like a proper failure. Since i don't have a real error Handler there, this is the best i can do without pulling in a real error system for rustdoc.

This PR is blocked on #46853, which will fix the rendering differences that were present on master when i started this branch.
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.

4 participants