Skip to content

Bump the bootstrap cargo to match the one paired with 1.13 - #37635

Merged
brson merged 1 commit into
rust-lang:masterfrom
brson:bootstrap
Nov 17, 2016
Merged

Bump the bootstrap cargo to match the one paired with 1.13#37635
brson merged 1 commit into
rust-lang:masterfrom
brson:bootstrap

Conversation

@brson

@brsonbrson commented Nov 7, 2016

Copy link
Copy Markdown
Contributor

Now that 1.13 beta has a new cargo pairing, update the master bootstrap to use it.

r? @alexcrichton

@alexcrichton

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Nov 8, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit 5ad235c has been approved by alexcrichton

@eddyb

eddyb commented Nov 9, 2016

Copy link
Copy Markdown
Contributor

@bors r- Travis failure looks legit (stricter Cargo semantics?).

@alexcrichton

Copy link
Copy Markdown
Member

If I'm reading that correctly it's likely a bug in Cargo, one I'm not sure how to fix, and a showstopper for updating...

Well... rustbuild's not official yet?

@brson

Copy link
Copy Markdown
ContributorAuthor

We have to get master bootstrapping from this exact compiler somehow.

@brson

Copy link
Copy Markdown
ContributorAuthor

Oh that's not true. We can fix the bug in cargo, bump the cargo that's paired with beta, then bootstrap master off that one.

@alexcrichton

Copy link
Copy Markdown
Member

I've got a fix for the Cargo issue at rust-lang/cargo#3280

@brsonbrson mentioned this pull request Nov 17, 2016
@brson
brson merged commit beb9a0d into rust-lang:masterNov 17, 2016
@alexcrichton

Copy link
Copy Markdown
Member

If anyone's following along at home this was accidentally merged and reverted in ba872f2

Sign up for freeto 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.

4 participants

@brson@alexcrichton@bors@eddyb