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

Backport fix for rustdoc overflows #55590

Conversation

nikomatsakis
Copy link
Contributor

Backport of #54199 to stable

Fixes #52873

@rust-highfive
Copy link
Collaborator

r? @cramertj

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against stable. Please double check that you specified the right target!

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 1, 2018
@nikomatsakis
Copy link
Contributor Author

@bors r=eddyb

This was a clean backport, so I will just carry over the r+ that @eddyb left on #54199

@bors
Copy link
Contributor

bors commented Nov 1, 2018

📌 Commit ffaf7ee has been approved by eddyb

@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 Nov 1, 2018
@pietroalbini
Copy link
Member

cc @Mark-Simulacrum, should we rollup this in the point release PR instead of landing it on its own?

@Mark-Simulacrum
Copy link
Member

@bors r-

Yes, I'd rather not have the stable branch out of sync for too long (and I think that could maybe cause issues with dev-static builds, too).

@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 Nov 1, 2018
@Mark-Simulacrum Mark-Simulacrum added stable-nominated Nominated for backporting to the compiler in the stable channel. stable-accepted Accepted for backporting to the compiler in the stable channel. S-waiting-on-team Status: Awaiting decision from the relevant subteam (see the T-<team> label). T-release Relevant to the release subteam, which will review and decide on the PR/issue. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 1, 2018
@weiznich
Copy link
Contributor

weiznich commented Nov 2, 2018

Does this also fix #54524?

@nikomatsakis
Copy link
Contributor Author

@weiznich seems likely, but I haven't tried it yet

@weiznich
Copy link
Contributor

weiznich commented Nov 2, 2018

@nikomatsakis After looking at the patch I do not think that this will fix building diesels documentation, because it is the same patch that was applied to nightly some time back. The overflow continues to happen with the latest (rustdoc +nightly --version rustdoc 1.32.0-nightly (451987d 2018-11-01)) nightly.

@nikomatsakis
Copy link
Contributor Author

@weiznich ah, ok.

@nikomatsakis
Copy link
Contributor Author

@Mark-Simulacrum ok sorry just let me know how you want to proceed :)

@Mark-Simulacrum
Copy link
Member

Essentially we should make this PR have the necessary commits to land on stable and 2-3 days out we'd roll-up all the stable targeting PRs into one and land that. So I think this PR might need some changes perhaps?

@pietroalbini
Copy link
Member

@Mark-Simulacrum I don't think there is any fix for the diesel docs regression yet.

@Mark-Simulacrum
Copy link
Member

Right, but when/if that happens we'll want to also backport that (perhaps in this PR).

@pietroalbini pietroalbini removed stable-accepted Accepted for backporting to the compiler in the stable channel. stable-nominated Nominated for backporting to the compiler in the stable channel. labels Nov 7, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-team Status: Awaiting decision from the relevant subteam (see the T-<team> label). T-release Relevant to the release subteam, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants