Skip to content

include rustc-std-workspace-alloc in rust-src #60306

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

Merged
merged 1 commit into from
Apr 27, 2019
Merged

Conversation

RalfJung
Copy link
Member

This is needed to fix japaric/xargo#240

@rust-highfive
Copy link
Contributor

r? @alexcrichton

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 26, 2019
@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Collaborator

bors commented Apr 26, 2019

📌 Commit 3280b72 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 Apr 26, 2019
@RalfJung
Copy link
Member Author

@bors p=1
unblocks fixing Miri

@bors
Copy link
Collaborator

bors commented Apr 26, 2019

⌛ Testing commit 3280b72 with merge fbe428ce435ddbc1dd561f0dc242f907017530c1...

@bors
Copy link
Collaborator

bors commented Apr 26, 2019

⌛ Testing commit 3280b72 with merge ab9c016...

bors added a commit that referenced this pull request Apr 26, 2019
include rustc-std-workspace-alloc in rust-src

This is needed to fix japaric/xargo#240
@bors
Copy link
Collaborator

bors commented Apr 27, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: alexcrichton
Pushing ab9c016 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 27, 2019
@bors bors merged commit 3280b72 into rust-lang:master Apr 27, 2019
bors bot added a commit to japaric/xargo that referenced this pull request May 9, 2019
241:  add patch for rustc-std-workspace-alloc  r=jethrogb a=RalfJung

Blocked by #235 and rust-lang/rust#60306.

Co-authored-by: Ralf Jung <[email protected]>
@RalfJung RalfJung deleted the xargo branch June 10, 2019 11:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Broken with current nightly
4 participants