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: Fix re-exporting primitive types #68556

Merged
merged 1 commit into from
Jan 29, 2020

Conversation

ollie27
Copy link
Member

@ollie27 ollie27 commented Jan 26, 2020

  • Generate links to the primitive type docs for re-exports.
  • Don't ICE on cross crate primitive type re-exports.
  • Make primitive type re-exports show up cross crate.

Fixes #67646
Closes #67972

r? @GuillaumeGomez

* Generate links to the primitive type docs for re-exports.
* Don't ICE on cross crate primitive type re-exports.
* Make primitive type re-exports show up cross crate.
@JohnTitor JohnTitor added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 27, 2020
@GuillaumeGomez
Copy link
Member

Considering you took some parts of my code, you could have include my commit and work from it... Otherwise looks good.

@bors: r+

@bors
Copy link
Contributor

bors commented Jan 27, 2020

📌 Commit bbc2ae7 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 27, 2020
@ollie27
Copy link
Member Author

ollie27 commented Jan 28, 2020

Considering you took some parts of my code, you could have include my commit and work from it...

Sorry about that.

JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jan 29, 2020
…, r=GuillaumeGomez

rustdoc: Fix re-exporting primitive types

* Generate links to the primitive type docs for re-exports.
* Don't ICE on cross crate primitive type re-exports.
* Make primitive type re-exports show up cross crate.

Fixes rust-lang#67646
Closes rust-lang#67972

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

Successful merges:

 - #68289 (Don't ICE on path-collision in dep-graph)
 - #68378 (Add BTreeMap::remove_entry)
 - #68553 (Fix run button positionning in case of scrolling)
 - #68556 (rustdoc: Fix re-exporting primitive types)
 - #68582 (Add E0727 long explanation)
 - #68592 (fix: typo in vec.rs)
 - #68619 (Fix a few spelling mistakes)
 - #68620 (Update links to WASI docs in time.rs module)

Failed merges:

r? @ghost
@bors bors merged commit bbc2ae7 into rust-lang:master Jan 29, 2020
@ollie27 ollie27 deleted the rustdoc_primitive_re-export branch January 29, 2020 16:41
@jyn514 jyn514 added A-cross-crate-reexports Area: Documentation that has been re-exported from a different crate T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Oct 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-cross-crate-reexports Area: Documentation that has been re-exported from a different crate 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
Development

Successfully merging this pull request may close these issues.

rustdoc primitive re-export
5 participants