Skip to content

rustbuild: Fix compiler docs #40448

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

Merged
merged 2 commits into from
Mar 13, 2017
Merged

Conversation

ollie27
Copy link
Member

@ollie27 ollie27 commented Mar 12, 2017

  • Make sure std docs are generated before compiler docs so rustdoc uses
    relative links.
  • Don't document the rustc and rustdoc binary crates as they overwrite
    the real rustc and rustdoc crates.

Fixes #40217

r? @alexcrichton

* Make sure std docs are generated before compiler docs so rustdoc uses
relative links.
* Don't document the rustc and rustdoc binary crates as they overwrite
the real rustc and rustdoc crates.
@alexcrichton
Copy link
Member

Looks like there's a test failure on travis?

Use the same step names as the actual build.
@ollie27
Copy link
Member Author

ollie27 commented Mar 12, 2017

I think I've fixed the tests.

@alexcrichton
Copy link
Member

@bors: r+

Thanks!

@bors
Copy link
Collaborator

bors commented Mar 12, 2017

📌 Commit 0e0bac9 has been approved by alexcrichton

@bors
Copy link
Collaborator

bors commented Mar 13, 2017

⌛ Testing commit 0e0bac9 with merge 75fb56f...

bors added a commit that referenced this pull request Mar 13, 2017
rustbuild: Fix compiler docs

* Make sure std docs are generated before compiler docs so rustdoc uses
relative links.
* Don't document the rustc and rustdoc binary crates as they overwrite
the real rustc and rustdoc crates.

Fixes #40217

r? @alexcrichton
@bors
Copy link
Collaborator

bors commented Mar 13, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 75fb56f to master...

@bors bors merged commit 0e0bac9 into rust-lang:master Mar 13, 2017
@ollie27 ollie27 deleted the rustbuild_docs_compiler branch March 14, 2017 11:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants