Skip to content

Upgrade bootstrap compiler to 1.12 #35766

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
Merged
merged 3 commits into from
Aug 23, 2016
Merged

Upgrade bootstrap compiler to 1.12 #35766

merged 3 commits into from
Aug 23, 2016

Conversation

brson
Copy link
Contributor

@brson brson commented Aug 17, 2016

@brson
Copy link
Contributor Author

brson commented Aug 17, 2016

Wait, I don't think i did the hash right...

@brson
Copy link
Contributor Author

brson commented Aug 17, 2016

echo -n 1.12.0-beta.1 | md5sum | head -c 8?

@brson
Copy link
Contributor Author

brson commented Aug 17, 2016

ok, now it's ready.

@brson
Copy link
Contributor Author

brson commented Aug 17, 2016

Aparently the version of cargo here needs to be bumped, along with cargo-revs.txt in rust-packaging.

@alexcrichton
Copy link
Member

@bors: r+

This probably won't land though until rust-lang/cargo#3005 is fixed, so we may want to avoid updating Cargo just yet

@bors
Copy link
Collaborator

bors commented Aug 17, 2016

📌 Commit ab6ca7e has been approved by alexcrichton

@eddyb eddyb mentioned this pull request Aug 17, 2016
Merged
@eddyb
Copy link
Member

eddyb commented Aug 18, 2016

This doesn't compile AFAICT.

@bors r-

bors added a commit that referenced this pull request Aug 18, 2016
@bors
Auto merge of #35769 - eddyb:rollup, r=eddyb
9d6520f 
Rollup of 12 pull requests

- Successful merges: #35346, #35734, #35739, #35740, #35742, #35744, #35749, #35750, #35751, #35756, #35766, #35768
- Failed merges:
@nagisa
Copy link
Member

nagisa commented Aug 18, 2016

You need to clean-up the cfg(stage0) stuff in this PR as well.

@brson
Copy link
Contributor Author

brson commented Aug 18, 2016

Removed the stage0 stuff. Seems to build. Still testing.

eddyb
eddyb reviewed Aug 18, 2016
View reviewed changes
src/libcore/cmp.rs
}

#[cfg(not(stage0))]
not_stage0!();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The contents of this macro need to stay around (without any #[cfg]).

@brson
Copy link
Contributor Author

brson commented Aug 19, 2016

Updated. Thanks for the review @eddyb .

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Collaborator

bors commented Aug 19, 2016

📌 Commit fce605e has been approved by alexcrichton

@bors
Copy link
Collaborator

bors commented Aug 21, 2016

⌛ Testing commit fce605e with merge 745cc1d...

@bors
Copy link
Collaborator

bors commented Aug 21, 2016

💔 Test failed - auto-linux-64-cargotest

@brson
Copy link
Contributor Author

brson commented Aug 22, 2016

r? @alexcrichton

@brson
Copy link
Contributor Author

brson commented Aug 22, 2016

@bors r=alexcrichton

@bors
Copy link
Collaborator

bors commented Aug 22, 2016

📌 Commit 3129398 has been approved by alexcrichton

@brson
Copy link
Contributor Author

brson commented Aug 23, 2016

@bors r=alexcrichton

@bors
Copy link
Collaborator

bors commented Aug 23, 2016

📌 Commit 144cc72 has been approved by alexcrichton

@bors
Copy link
Collaborator

bors commented Aug 23, 2016

⌛ Testing commit 144cc72 with merge 599f1b9...

bors added a commit that referenced this pull request Aug 23, 2016
@bors
Auto merge of #35766 - brson:bump, r=alexcrichton
599f1b9 
Upgrade bootstrap compiler to 1.12

r? @alexcrichton
@bors
Copy link
Collaborator

bors commented Aug 23, 2016

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-cargotest, auto-linux-64-cross-freebsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-no-mir, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-no-mir, auto-win-msvc-64-opt-rustbuild
Approved by: alexcrichton
Pushing 599f1b9 to master...

@bors bors merged commit 144cc72 into rust-lang:master Aug 23, 2016
@bors bors mentioned this pull request Aug 23, 2016
Merged
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@alexcrichton alexcrichton

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@brson @alexcrichton @bors @eddyb @nagisa