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.

Sign up for GitHub

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

Jump to bottom

move const_eval and check_match out of librustc into their own crate #32259

Merged
merged 2 commits into from
Mar 31, 2016
Merged

move const_eval and check_match out of librustc into their own crate #32259

merged 2 commits into from
Mar 31, 2016

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented Mar 15, 2016

@arielb1
Copy link
Contributor

arielb1 commented Mar 15, 2016

You also have to fix rustdoc

@oli-obk
Copy link
Contributor Author

oli-obk commented Mar 15, 2016

fixed and ran make doc

@arielb1
Copy link
Contributor

arielb1 commented Mar 15, 2016

@bors r+

@bors
Copy link
Contributor

bors commented Mar 15, 2016

📌 Commit 7321adc has been approved by arielb1

@oli-obk
Copy link
Contributor Author

oli-obk commented Mar 15, 2016

travis found a leftover e in middle::const_eval: https://s3.amazonaws.com/archive.travis-ci.org/jobs/116132961/log.txt

@bors
Copy link
Contributor

bors commented Mar 17, 2016

☔ The latest upstream changes (presumably #32237) made this pull request unmergeable. Please resolve the merge conflicts.

@oli-obk
Copy link
Contributor Author

oli-obk commented Mar 18, 2016

rebased

@arielb1
Copy link
Contributor

arielb1 commented Mar 18, 2016

@bors r+

@bors
Copy link
Contributor

bors commented Mar 18, 2016

📌 Commit cd9118e has been approved by arielb1

@bors
Copy link
Contributor

bors commented Mar 18, 2016

🔒 Merge conflict

@bors
Copy link
Contributor

bors commented Mar 18, 2016

☔ The latest upstream changes (presumably #32282) made this pull request unmergeable. Please resolve the merge conflicts.

@oli-obk oli-obk force-pushed the move_const_eval branch 2 times, most recently from aea5a88 to 4173357 Compare March 22, 2016 14:00
@oli-obk
Copy link
Contributor Author

oli-obk commented Mar 22, 2016

rebased

@bors
Copy link
Contributor

bors commented Mar 23, 2016

☔ The latest upstream changes (presumably #32204) made this pull request unmergeable. Please resolve the merge conflicts.

@oli-obk
Copy link
Contributor Author

oli-obk commented Mar 23, 2016

rebased

@bors
Copy link
Contributor

bors commented Mar 23, 2016

☔ The latest upstream changes (presumably #32454) made this pull request unmergeable. Please resolve the merge conflicts.

@oli-obk
Copy link
Contributor Author

oli-obk commented Mar 24, 2016

rebased

@bors
Copy link
Contributor

bors commented Mar 25, 2016

☔ The latest upstream changes (presumably #31908) made this pull request unmergeable. Please resolve the merge conflicts.

@oli-obk
Copy link
Contributor Author

oli-obk commented Mar 29, 2016

rebased

@bors
Copy link
Contributor

bors commented Mar 30, 2016

☔ The latest upstream changes (presumably #32576) made this pull request unmergeable. Please resolve the merge conflicts.

@oli-obk
Copy link
Contributor Author

oli-obk commented Mar 30, 2016

rebased

@bluss
Copy link
Member

bluss commented Mar 30, 2016

@bors r=arielb1

@bors
Copy link
Contributor

bors commented Mar 30, 2016

📌 Commit 7a580d9 has been approved by arielb1

@bors
Copy link
Contributor

bors commented Mar 30, 2016

⌛ Testing commit 7a580d9 with merge fa5b3b0...

@bors
Copy link
Contributor

bors commented Mar 30, 2016

💔 Test failed - auto-win-msvc-64-opt-rustbuild

@oli-obk
Copy link
Contributor Author

oli-obk commented Mar 30, 2016

fixed

rustbuild used ../graphviz instead of ../libgraphviz

@oli-obk
Copy link
Contributor Author

oli-obk commented Mar 30, 2016

I managed to get rustbuild to work on my machine... make check does not much more than make, but it works

@alexcrichton
Copy link
Member

@bors: r+ 3eac647

@bors
Copy link
Contributor

bors commented Mar 30, 2016

⌛ Testing commit 3eac647 with merge 8819cb1...

@alexcrichton
Copy link
Member

@bors: retry force

One of these days restarting buildbot won't be a multi-hour-long ordeal...

Manishearth added a commit to Manishearth/rust that referenced this pull request Mar 30, 2016
@Manishearth
Rollup merge of rust-lang#32259 - oli-obk:move_const_eval, r=alexcric…
9957081 
…hton

move `const_eval` and `check_match` out of `librustc` into their own crate

r? @arielb1
@Manishearth Manishearth mentioned this pull request Mar 30, 2016
Merged
bors added a commit that referenced this pull request Mar 30, 2016
@bors
Auto merge of #32628 - Manishearth:rollup, r=Manishearth
30a3849 
Rollup of 4 pull requests

- Successful merges: #32259, #32494, #32612, #32618
- Failed merges: #32562
@bors bors merged commit 3eac647 into rust-lang:master Mar 31, 2016
@oli-obk oli-obk deleted the move_const_eval branch March 31, 2016 07:05
@mcarton mcarton mentioned this pull request Mar 31, 2016
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@arielb1 arielb1

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@oli-obk @arielb1 @bors @bluss @alexcrichton