Skip to content

[beta] A few final backports - #49332

Merged
alexcrichton merged 2 commits into
rust-lang:betafrom
alexcrichton:beta-next
Mar 24, 2018
Merged

[beta] A few final backports#49332
alexcrichton merged 2 commits into
rust-lang:betafrom
alexcrichton:beta-next

Conversation

@alexcrichton

@alexcrichtonalexcrichton commented Mar 24, 2018

Copy link
Copy Markdown
Member

alexcrichtonand 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...
Closesrust-lang#48226
@michaelwoerister@alexcrichton
Fix DefKey lookup for proc-macro crates.
a1d7c15
@rust-highfive

rust-highfive commented Mar 24, 2018

Copy link
Copy Markdown
Contributor

r? @pnkfelix

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

@rust-highfive

rust-highfive commented Mar 24, 2018

Copy link
Copy Markdown
Contributor

warningWarningwarning

  • 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-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 24, 2018
@alexcrichton

alexcrichton commented Mar 24, 2018

Copy link
Copy Markdown
MemberAuthor

@bors: r+ p=100

@bors

bors commented Mar 24, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit a1d7c15 has been approved by alexcrichton

@borsbors 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

bors commented Mar 24, 2018

Copy link
Copy Markdown
Collaborator

⌛ 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

bors commented Mar 24, 2018

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@borsbors 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

alexcrichton commented Mar 24, 2018

Copy link
Copy Markdown
MemberAuthor

@bors: retry

timed out

@borsbors 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

alexcrichton commented Mar 24, 2018

Copy link
Copy Markdown
MemberAuthor

Actually, all dist jobs passed, merging manually.

@alexcrichton
alexcrichton merged commit a1d7c15 into rust-lang:betaMar 24, 2018
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@pnkfelixpnkfelix

Labels

S-waiting-on-borsStatus: 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