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

Use euclid 0.15.1 #1422

Merged
merged 1 commit into from Jun 23, 2017
Merged

Use euclid 0.15.1 #1422

merged 1 commit into from Jun 23, 2017

Conversation

@eqrion
Copy link
Contributor

eqrion commented Jun 22, 2017

TypedRect is marked repr(C) in euclid:0.15.1, which helps with the FFI.


This change is Reviewable

@bors-servo
Copy link
Contributor

bors-servo commented Jun 22, 2017

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

TypedRect is marked repr(C) in euclid:0.15.1, which helps with the FFI.
@eqrion eqrion force-pushed the eqrion:euclid/bump branch from 9d2247e to c701c2e Jun 22, 2017
@emilio
Copy link
Member

emilio commented Jun 23, 2017

@bors-servo
Copy link
Contributor

bors-servo commented Jun 23, 2017

📌 Commit c701c2e has been approved by emilio

@bors-servo
Copy link
Contributor

bors-servo commented Jun 23, 2017

Testing commit c701c2e with merge 727fd54...

bors-servo added a commit that referenced this pull request Jun 23, 2017
Use euclid 0.15.1

TypedRect is marked repr(C) in euclid:0.15.1, which helps with the FFI.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/webrender/1422)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jun 23, 2017

💔 Test failed - status-travis

@kvark
Copy link
Member

kvark commented Jun 23, 2017

weird

c++: internal compiler error: Killed (program cc1plus)

@bors-servo retry

@bors-servo
Copy link
Contributor

bors-servo commented Jun 23, 2017

Testing commit c701c2e with merge b294efe...

bors-servo added a commit that referenced this pull request Jun 23, 2017
Use euclid 0.15.1

TypedRect is marked repr(C) in euclid:0.15.1, which helps with the FFI.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/webrender/1422)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jun 23, 2017

☀️ Test successful - status-travis
Approved by: emilio
Pushing b294efe to master...

@bors-servo bors-servo merged commit c701c2e into servo:master Jun 23, 2017
2 of 3 checks passed
2 of 3 checks passed
continuous-integration/travis-ci/pr The Travis CI build failed
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details
@eqrion eqrion deleted the eqrion:euclid/bump branch Jun 23, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.