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

Update Cargo to fix nightly channel #40450

Merged
merged 1 commit into from
Mar 12, 2017
Merged

Conversation

alexcrichton
Copy link
Member

@alexcrichton alexcrichton commented Mar 12, 2017

This commit updates Cargo with rust-lang/cargo#3820 which includes a fix for
rust-lang/cargo#3819. At the same time this also slightly tweaks how rustbuild
builds cargo to ensure that all the build information (including git info and
such) makes its way into the binary.

Closes rust-lang/cargo#3819

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

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

@alexcrichton
Copy link
Member Author

@bors: r+ p=1

I'm going to accelerate this to fix nightlies, but @brson please let me know if you've got comments.

@bors
Copy link
Contributor

bors commented Mar 12, 2017

📌 Commit 0575bb1 has been approved by alexcrichton

This commit updates Cargo with rust-lang/cargo#3820 which includes a fix for
rust-lang/cargo#3819. At the same time this also slightly tweaks how rustbuild
builds cargo to ensure that all the build information (including git info and
such) makes its way into the binary.

Closes rust-lang/cargo#3820
@alexcrichton
Copy link
Member Author

@bors: r+

@bors
Copy link
Contributor

bors commented Mar 12, 2017

📌 Commit b5798a9 has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Mar 12, 2017

⌛ Testing commit b5798a9 with merge 824c9eb...

bors added a commit that referenced this pull request Mar 12, 2017
Update Cargo to fix nightly channel

This commit updates Cargo with rust-lang/cargo#3820 which includes a fix for
rust-lang/cargo#3819. At the same time this also slightly tweaks how rustbuild
builds cargo to ensure that all the build information (including git info and
such) makes its way into the binary.

Closes rust-lang/cargo#3819
@bors
Copy link
Contributor

bors commented Mar 12, 2017

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

@bors bors merged commit b5798a9 into rust-lang:master Mar 12, 2017
@alexcrichton alexcrichton deleted the fix-cargo branch March 13, 2017 16:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Panic in cargo::version
4 participants