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.

Sign up for GitHub

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

Jump to bottom

[beta] A few final backports #49332

Merged
merged 2 commits into from
Mar 24, 2018
Merged

[beta] A few final backports #49332

merged 2 commits into from
Mar 24, 2018

Conversation

alexcrichton
Copy link
Member

alexcrichton and others added 2 commits March 24, 2018 07:40
@alexcrichton
rustc: Update LLVM
73364a3 
This pulls in the rest of LLVM's `release_60` branch (the actual 6.0.0 release)
and also pulls in a cherry-pick to...

Closes rust-lang#48226
@michaelwoerister @alexcrichton
Fix DefKey lookup for proc-macro crates.
a1d7c15
@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!
  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 24, 2018
@alexcrichton
Copy link
Member Author

@bors: r+ p=100

@bors
Copy link
Contributor

bors commented Mar 24, 2018

📌 Commit a1d7c15 has been approved by alexcrichton

@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 Mar 24, 2018
@bors
Copy link
Contributor

bors commented Mar 24, 2018

⌛ Testing commit a1d7c15 with merge da81b88...

bors added a commit that referenced this pull request Mar 24, 2018
@bors
Auto merge of #49332 - alexcrichton:beta-next, r=alexcrichton
da81b88 
[beta] A few final backports

Backport of

* #48782
* #49273
@bors
Copy link
Contributor

bors commented Mar 24, 2018

💔 Test failed - status-travis

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 24, 2018
@alexcrichton
Copy link
Member Author

@bors: retry

timed out

@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 Mar 24, 2018
@alexcrichton
Copy link
Member Author

Actually, all dist jobs passed, merging manually.

@alexcrichton alexcrichton merged commit a1d7c15 into rust-lang:beta Mar 24, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@pnkfelix pnkfelix

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@alexcrichton @rust-highfive @bors @pnkfelix @michaelwoerister