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 Rect::inner_rect from euclid #19942

Merged
merged 1 commit into from Feb 8, 2018
Merged

Use Rect::inner_rect from euclid #19942

merged 1 commit into from Feb 8, 2018

Conversation

@pyfisch
Copy link
Contributor

pyfisch commented Feb 3, 2018 •
edited by SimonSapin

Update euclid.

This change is Reviewable
@highfive
Copy link

highfive commented Feb 3, 2018

Heads up! This PR modifies the following files:

  • @emilio: components/layout/fragment.rs, components/layout/Cargo.toml, components/layout/display_list/builder.rs
@highfive
Copy link

highfive commented Feb 3, 2018

warning Warning warning

  • These commits modify layout code, but no tests are modified. Please consider adding a test!
@emilio
emilio approved these changes Feb 4, 2018
View changes
Copy link
Member

emilio left a comment

Looks great, thanks!
@emilio
Copy link
Member

emilio commented Feb 4, 2018

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

bors-servo commented Feb 4, 2018

📌 Commit 8390052 has been approved by emilio
@highfive highfive assigned emilio and unassigned pcwalton Feb 4, 2018
@bors-servo
Copy link
Contributor

bors-servo commented Feb 4, 2018

⌛ Testing commit 8390052 with merge b2000b7...
bors-servo added a commit that referenced this pull request Feb 4, 2018
@bors-servo
Auto merge of #19942 - pyfisch:update-euclid, r=emilio
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
b2000b7 
Use Rect::inner_rect from euclid

Update euclid.

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

bors-servo commented Feb 4, 2018

💔 Test failed - linux-rel-css
@emilio
Copy link
Member

emilio commented Feb 4, 2018

There are a couple of tests which are failing the assertions in euclid's inner_rect. All seem to come from Fragment::stacking_relative_content_box... Fun
@bors-servo
Copy link
Contributor

bors-servo commented Feb 7, 2018

☔ The latest upstream changes (presumably #19931) made this pull request unmergeable. Please resolve the merge conflicts.
@pyfisch
Use Rect::inner_rect from euclid
Loading status checks…
5697171 
Update euclid.
@pyfisch pyfisch force-pushed the pyfisch:update-euclid branch from 8390052 to 5697171 Feb 8, 2018
@pyfisch
Copy link
Contributor Author

pyfisch commented Feb 8, 2018

rebased & fixed
@jdm jdm removed the S-needs-rebase label Feb 8, 2018
@emilio
emilio approved these changes Feb 8, 2018
View changes
Copy link
Member

emilio left a comment

Well, the fix is not removing the stacking_relative_content_box callers, which is a bit unorthodox. I can't think why would that assertion fire, mind explaining if you've debugged it?

Anyway this is great, thanks so much!
@emilio
Copy link
Member

emilio commented Feb 8, 2018

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

bors-servo commented Feb 8, 2018

📌 Commit 5697171 has been approved by emilio
@bors-servo
Copy link
Contributor

bors-servo commented Feb 8, 2018

⌛ Testing commit 5697171 with merge cd663ea...
bors-servo added a commit that referenced this pull request Feb 8, 2018
@bors-servo
Auto merge of #19942 - pyfisch:update-euclid, r=emilio
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
cd663ea 
Use Rect::inner_rect from euclid

Update euclid.

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

bors-servo commented Feb 8, 2018

💔 Test failed - linux-rel-wpt
@jdm
Copy link
Member

jdm commented Feb 8, 2018

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

bors-servo commented Feb 8, 2018

⚡ Previous build results for android, arm32, arm64, linux-dev, linux-rel-css, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev are reusable. Rebuilding only linux-rel-wpt...
@bors-servo
Copy link
Contributor

bors-servo commented Feb 8, 2018

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev
Approved by: emilio
Pushing cd663ea to master...
@bors-servo bors-servo mentioned this pull request Feb 8, 2018
Open
2 of 5 tasks complete
@bors-servo bors-servo merged commit 5697171 into servo:master Feb 8, 2018
3 of 4 checks passed
3 of 4 checks passed
Taskcluster (pull_request) TaskGroup: failure
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@pyfisch pyfisch mentioned this pull request Feb 12, 2018
Closed
@pyfisch pyfisch deleted the pyfisch:update-euclid branch May 2, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@emilio emilio

Assignees

@emilio emilio

Labels
S-tests-failed
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
@pyfisch @highfive @emilio @bors-servo @jdm @pcwalton
You can’t perform that action at this time.