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 rustdoc ICE fixes to beta #47969

Merged
merged 2 commits into from
Feb 3, 2018
Merged

Conversation

Manishearth
Copy link
Member

backport of #47959

@rust-highfive
Copy link
Collaborator

r? @pnkfelix

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

@rust-highfive
Copy link
Collaborator

warning Warning warning

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

@Manishearth Manishearth added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Feb 2, 2018
@shepmaster shepmaster added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 3, 2018
@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Feb 3, 2018
@Mark-Simulacrum
Copy link
Member

I'm going to go ahead and land this since we believe it to be an adequate, and minimal, fix. We can revert and apply a different fix if necessary.

@bors r+ p=10

@bors
Copy link
Contributor

bors commented Feb 3, 2018

📌 Commit c3cf9bc has been approved by Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Feb 3, 2018

⌛ Testing commit c3cf9bc with merge 69631fcf022795380b662e12d0ec821988005ced...

@bors
Copy link
Contributor

bors commented Feb 3, 2018

💔 Test failed - status-appveyor

@kennytm
Copy link
Member

kennytm commented Feb 3, 2018

@bors retry #46903

@bors
Copy link
Contributor

bors commented Feb 3, 2018

⌛ Testing commit c3cf9bc with merge 03f456d...

bors added a commit that referenced this pull request Feb 3, 2018
Backport rustdoc ICE fixes to beta

backport of #47959
@bors
Copy link
Contributor

bors commented Feb 3, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: Mark-Simulacrum
Pushing 03f456d to beta...

@bors bors merged commit c3cf9bc into rust-lang:beta Feb 3, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants