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

rust-geom API changes #6349

Merged
merged 1 commit into from Jun 13, 2015
Merged

rust-geom API changes #6349

merged 1 commit into from Jun 13, 2015

Conversation

@frewsxcv
Copy link
Member

frewsxcv commented Jun 12, 2015

Shouldn't be merged until these have merged:

servo/euclid#81

servo/surfman#13

servo/rust-layers#178

I'll also need to update the Cargo lock files once they merge

Review on Reviewable
@hoppipolla-critic-bot
Copy link

hoppipolla-critic-bot commented Jun 12, 2015

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

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.
@frewsxcv frewsxcv mentioned this pull request Jun 12, 2015
Merged
@nox
Copy link
Member

nox commented Jun 12, 2015

Servo also needs servo/euclid#77 for #6237.
@frewsxcv frewsxcv force-pushed the frewsxcv:geom-api-changes branch from f48da1f to 7afcf98 Jun 12, 2015
@pcwalton
Copy link
Contributor

pcwalton commented Jun 12, 2015

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

bors-servo commented Jun 12, 2015

📌 Commit 7afcf98 has been approved by pcwalton
@bors-servo
Copy link
Contributor

bors-servo commented Jun 13, 2015

⌛ Testing commit 7afcf98 with merge 0a761b5...
bors-servo pushed a commit that referenced this pull request Jun 13, 2015
bors-servo
Auto merge of #6349 - frewsxcv:geom-api-changes, r=pcwalton
0a761b5 
Shouldn't be merged until these have merged:

servo/euclid#81

servo/surfman#13

servo/rust-layers#178

~~I'll also need to update the Cargo lock files once they merge~~

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

bors-servo commented Jun 13, 2015

💔 Test failed - gonk
@nox
Copy link
Member

nox commented Jun 13, 2015 

/home/servo/.cargo/git/checkouts/rust-offscreen-rendering-context-902f85b061901132/master/src/platform/with_egl/utils.rs:24:42: 24:62 error: unresolved name `egl::EGL_PBUFFER_BIT`
/home/servo/.cargo/git/checkouts/rust-offscreen-rendering-context-902f85b061901132/master/src/platform/with_egl/utils.rs:24         egl::EGL_SURFACE_TYPE as EGLint, egl::EGL_PBUFFER_BIT as EGLint,
                                                                                                                                                                     ^~~~~~~~~~~~~~~~~~~~

-S-awaiting-review +S-needs-code-changes

Review status: 0 of 32 files reviewed, all discussions resolved, some commit checks failed.

Comments from the review on Reviewable.io
@frewsxcv frewsxcv force-pushed the frewsxcv:geom-api-changes branch from 7afcf98 to f4db2bb Jun 13, 2015
@frewsxcv
Copy link
Member Author

frewsxcv commented Jun 13, 2015

@nox I just cargo updated egl since I think it needed an upgrade. Can I get a retry?
@jdm
Copy link
Member

jdm commented Jun 13, 2015

This might overlap with #6356.
@bors-servo
Copy link
Contributor

bors-servo commented Jun 13, 2015

☔ The latest upstream changes (presumably #6366) made this pull request unmergeable. Please resolve the merge conflicts.
@frewsxcv frewsxcv force-pushed the frewsxcv:geom-api-changes branch from f4db2bb to d59e507 Jun 13, 2015
@frewsxcv
Copy link
Member Author

frewsxcv commented Jun 13, 2015

Merge conflicts addressed
@nox
Copy link
Member

nox commented Jun 13, 2015

@bors-servo: r=pcwalton
@bors-servo
Copy link
Contributor

bors-servo commented Jun 13, 2015

📌 Commit d59e507 has been approved by pcwalton
bors-servo pushed a commit that referenced this pull request Jun 13, 2015
bors-servo
Auto merge of #6349 - frewsxcv:geom-api-changes, r=pcwalton
a119d45 
Shouldn't be merged until these have merged:

servo/euclid#81

servo/surfman#13

servo/rust-layers#178

~~I'll also need to update the Cargo lock files once they merge~~

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

bors-servo commented Jun 13, 2015

⌛ Testing commit d59e507 with merge a119d45...
@bors-servo
Copy link
Contributor

bors-servo commented Jun 13, 2015

💔 Test failed - gonk
@frewsxcv
Copy link
Member Author

frewsxcv commented Jun 13, 2015

Ah okay now it looks like there actually compilation issues. Will address those now
@frewsxcv frewsxcv force-pushed the frewsxcv:geom-api-changes branch from d59e507 to 0a9e05e Jun 13, 2015
@frewsxcv
Copy link
Member Author

frewsxcv commented Jun 13, 2015

Okay, hopefully I got everything now (had to rebase to pick up a few changes)
@nox
Copy link
Member

nox commented Jun 13, 2015

@bors-servo: r=pcwalton
@bors-servo
Copy link
Contributor

bors-servo commented Jun 13, 2015

📌 Commit 0a9e05e has been approved by pcwalton
@bors-servo
Copy link
Contributor

bors-servo commented Jun 13, 2015

⌛ Testing commit 0a9e05e with merge c4b982a...
bors-servo pushed a commit that referenced this pull request Jun 13, 2015
bors-servo
Auto merge of #6349 - frewsxcv:geom-api-changes, r=pcwalton
c4b982a 
Shouldn't be merged until these have merged:

servo/euclid#81

servo/surfman#13

servo/rust-layers#178

~~I'll also need to update the Cargo lock files once they merge~~

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

bors-servo commented Jun 13, 2015

💔 Test failed - mac2
@frewsxcv
rust-geom API changes
Loading status checks…
5c408d2 
servo/euclid#81
@frewsxcv frewsxcv force-pushed the frewsxcv:geom-api-changes branch from 0a9e05e to 5c408d2 Jun 13, 2015
@frewsxcv
Copy link
Member Author

frewsxcv commented Jun 13, 2015

Missing import in cef, just fixed it
@nox
Copy link
Member

nox commented Jun 13, 2015

@bors-servo: r=pcwalton
@bors-servo
Copy link
Contributor

bors-servo commented Jun 13, 2015

📌 Commit 5c408d2 has been approved by pcwalton
@bors-servo
Copy link
Contributor

bors-servo commented Jun 13, 2015

⌛ Testing commit 5c408d2 with merge cfcd858...
bors-servo pushed a commit that referenced this pull request Jun 13, 2015
bors-servo
Auto merge of #6349 - frewsxcv:geom-api-changes, r=pcwalton
Loading status checks…
cfcd858 
Shouldn't be merged until these have merged:

servo/euclid#81

servo/surfman#13

servo/rust-layers#178

~~I'll also need to update the Cargo lock files once they merge~~

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

bors-servo commented Jun 13, 2015

☀️ Test successful - android, gonk, linux1, linux2, linux3, mac1, mac2, mac3
@bors-servo bors-servo merged commit 5c408d2 into servo:master Jun 13, 2015
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@frewsxcv frewsxcv deleted the frewsxcv:geom-api-changes branch Oct 9, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@pcwalton pcwalton

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
@frewsxcv @hoppipolla-critic-bot @nox @pcwalton @bors-servo @jdm @highfive
You can’t perform that action at this time.