Skip to content

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

Merged
brson merged 1 commit intorust-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 intorust-lang:masterfrom
brson:bootstrap

Conversation

@brson
Copy link
Copy Markdown
Contributor

@brson brson commented Nov 7, 2016

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
Copy link
Copy Markdown
Collaborator

bors commented Nov 8, 2016

📌 Commit 5ad235c has been approved by alexcrichton

@eddyb
Copy link
Copy Markdown
Member

eddyb commented Nov 9, 2016

@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
Contributor Author

brson commented Nov 10, 2016

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

@brson
Copy link
Copy Markdown
Contributor Author

brson commented Nov 10, 2016

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

@brson brson merged commit beb9a0d into rust-lang:master Nov 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 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.

4 participants