Skip to content

/ servo

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 from crates.io #6423

Merged
merged 1 commit into from Jun 19, 2015
Merged

Use euclid from crates.io #6423

merged 1 commit into from Jun 19, 2015

Conversation

@emilio
Copy link
Member

emilio commented Jun 18, 2015

Sorry for not doing it yesterday, I couldn't.

cc @metajack @SimonSapin

Review on Reviewable
@hoppipolla-critic-bot
Copy link

hoppipolla-critic-bot commented Jun 18, 2015

Critic review: https://critic.hoppipolla.co.uk/r/5326

This is an external review system which you may optionally use for the code review of your pull request.

In order to help critic track your changes, please do not make in-place history rewrites (e.g. via git rebase -i or git commit --amend) when updating this pull request.
@metajack
Copy link
Contributor

metajack commented Jun 18, 2015

@bors-servo r+

-S-awaiting-review +S-awaiting-merge

Reviewed 104 of 104 files at r1.
Review status: :shipit: all files reviewed at latest revision, all discussions resolved, all commit checks successful.

Comments from the review on Reviewable.io
@bors-servo
Copy link
Contributor

bors-servo commented Jun 18, 2015

📌 Commit 3c0fe4d has been approved by metajack
@bors-servo
Copy link
Contributor

bors-servo commented Jun 18, 2015

⌛ Testing commit 3c0fe4d with merge 5e62918...
bors-servo pushed a commit that referenced this pull request Jun 18, 2015
bors-servo
Auto merge of #6423 - ecoal95:euclid, r=metajack
5e62918 
Use euclid from crates.io

Sorry for not doing it yesterday, I couldn't.

cc @metajack @SimonSapin

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6423)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jun 18, 2015

💔 Test failed - gonk
@metajack
Copy link
Contributor

metajack commented Jun 18, 2015

@ecoal95 The build failed:

/home/servo/.cargo/git/checkouts/rust-offscreen-rendering-context-49a578ae84e64b98/master/src/platform/with_egl/native_gl_context.rs:122:22: 122:41 error: mismatched types:
 expected `*mut libc::types::common::c95::c_void`,
    found `*const libc::types::common::c95::c_void`
(values differ in mutability) [E0308]
/home/servo/.cargo/git/checkouts/rust-offscreen-rendering-context-49a578ae84e64b98/master/src/platform/with_egl/native_gl_context.rs:122             display: self.native_display                                                                                                                                                              ^~~~~~~~~~~~~~~~~~~
/home/servo/.cargo/git/checkouts/rust-offscreen-rendering-context-49a578ae84e64b98/master/src/platform/with_egl/native_gl_context.rs:122:22: 122:41 help: run `rustc --explain E0308` to see a detailed explanation
error: aborting due to previous error
Build failed, waiting for other jobs to finish...
Could not compile `offscreen_gl_context`.
@emilio
Copy link
Member Author

emilio commented Jun 18, 2015

Dang it, I couldn't cross-compile with the layers feature because of #6384, I assumed it was ok.

Give me a second.
@emilio emilio force-pushed the emilio:euclid branch from 3c0fe4d to 1e24c0a Jun 18, 2015
@emilio
Copy link
Member Author

emilio commented Jun 18, 2015

@metajack Should be good to go, hopefully (servo/surfman@d7df284)
@metajack
Copy link
Contributor

metajack commented Jun 18, 2015

@bors-servo r+

-S-awaiting-review +S-awaiting-merge

Reviewed 1 of 104 files at r1, 3 of 3 files at r2.
Review status: :shipit: all files reviewed at latest revision, all discussions resolved, all commit checks successful.

Comments from the review on Reviewable.io
@bors-servo
Copy link
Contributor

bors-servo commented Jun 18, 2015

📌 Commit 1e24c0a has been approved by metajack
@bors-servo
Copy link
Contributor

bors-servo commented Jun 18, 2015

⌛ Testing commit 1e24c0a with merge 2016208...
bors-servo pushed a commit that referenced this pull request Jun 18, 2015
bors-servo
Auto merge of #6423 - ecoal95:euclid, r=metajack
2016208 
Use euclid from crates.io

Sorry for not doing it yesterday, I couldn't.

cc @metajack @SimonSapin

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6423)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jun 18, 2015

💔 Test failed - gonk
@emilio
Use euclid from crates.io
Loading status checks…
8cbfb34
@emilio emilio force-pushed the emilio:euclid branch from 1e24c0a to 8cbfb34 Jun 18, 2015
@emilio
Copy link
Member Author

emilio commented Jun 18, 2015

Since it failed again, I went back just to servo/surfman@e79da8f

I think I'll try to update layers to use automatic bindings as suggested in a egl-rs commit by @glennw to fix the issue, and if that's not an option I'll go back to use egl-rs as layers does.
@emilio emilio mentioned this pull request Jun 18, 2015
Closed
@glennw
Copy link
Member

glennw commented Jun 18, 2015

@bors-servo: retry
@glennw
Copy link
Member

glennw commented Jun 18, 2015

@bors-servo: r+
@bors-servo
Copy link
Contributor

bors-servo commented Jun 18, 2015

📌 Commit 8cbfb34 has been approved by glennw
@bors-servo
Copy link
Contributor

bors-servo commented Jun 19, 2015

⌛ Testing commit 8cbfb34 with merge 74c4c9d...
bors-servo pushed a commit that referenced this pull request Jun 19, 2015
bors-servo
Auto merge of #6423 - ecoal95:euclid, r=glennw
74c4c9d 
Use euclid from crates.io

Sorry for not doing it yesterday, I couldn't.

cc @metajack @SimonSapin

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6423)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jun 19, 2015

💔 Test failed - mac3
@glennw
Copy link
Member

glennw commented Jun 19, 2015

@bors-servo retry
@bors-servo
Copy link
Contributor

bors-servo commented Jun 19, 2015

⌛ Testing commit 8cbfb34 with merge 4ebb95c...
bors-servo pushed a commit that referenced this pull request Jun 19, 2015
bors-servo
Auto merge of #6423 - ecoal95:euclid, r=glennw
Loading status checks…
4ebb95c 
Use euclid from crates.io

Sorry for not doing it yesterday, I couldn't.

cc @metajack @SimonSapin

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6423)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jun 19, 2015

☀️ Test successful - android, gonk, linux1, linux2, linux3, mac1, mac2, mac3
@bors-servo bors-servo merged commit 8cbfb34 into servo:master Jun 19, 2015
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@bors-servo bors-servo mentioned this pull request Jun 19, 2015
Merged
@SimonSapin
Copy link
Member

SimonSapin commented Jun 19, 2015

Yay! Thanks for the PR @ecoal95
@SimonSapin SimonSapin mentioned this pull request Jun 26, 2015
Closed
4 of 20 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
S-awaiting-review
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

7 participants
@emilio @hoppipolla-critic-bot @metajack @bors-servo @glennw @SimonSapin @highfive
You can’t perform that action at this time.