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

Cleanup ThreadSafeLayoutNodeChildrenIterator. #6657

Merged
merged 2 commits into from Jul 21, 2015
Merged

Cleanup ThreadSafeLayoutNodeChildrenIterator. #6657

merged 2 commits into from Jul 21, 2015

Conversation

Ms2ger
Copy link
Contributor

@Ms2ger Ms2ger commented Jul 18, 2015

Review on Reviewable

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Jul 18, 2015
@highfive
Copy link

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!

@hoppipolla-critic-bot
Copy link

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

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.

@Ms2ger Ms2ger added the S-needs-code-changes Changes have not yet been made that were requested by a reviewer. label Jul 19, 2015
@Ms2ger
Copy link
Contributor Author

Ms2ger commented Jul 19, 2015

I suspect this breaks something on elements without children but with both ::before and ::after; trying to write a test.

@Ms2ger Ms2ger force-pushed the ThreadSafeLayoutNodeChildrenIterator branch from 9c5c8c0 to ec098f5 Compare July 20, 2015 15:26
@highfive highfive removed the S-needs-code-changes Changes have not yet been made that were requested by a reviewer. label Jul 20, 2015
@Ms2ger
Copy link
Contributor Author

Ms2ger commented Jul 20, 2015

This already failed some of the CSS tests; should be good to go now.

@Ms2ger
Copy link
Contributor Author

Ms2ger commented Jul 20, 2015

@pcwalton r? please

@pcwalton
Copy link
Contributor

@bors-servo: r+

@bors-servo
Copy link
Contributor

📌 Commit ec098f5 has been approved by pcwalton

@bors-servo
Copy link
Contributor

⌛ Testing commit ec098f5 with merge b3d92e7...

bors-servo pushed a commit that referenced this pull request Jul 21, 2015
Auto merge of #6657 - Ms2ger:ThreadSafeLayoutNodeChildrenIterator, r=…
b3d92e7 
…pcwalton

Cleanup ThreadSafeLayoutNodeChildrenIterator.



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

💔 Test failed - mac1

@jdm
Copy link
Member

jdm commented Jul 21, 2015 

   Compiling layout v0.0.1 (file:///Users/servo/buildbot/slave/mac1/build/components/servo)
/Users/servo/buildbot/slave/mac1/build/components/layout/wrapper.rs:982:40: 982:87 error: mismatched types:
 expected `core::option::Option<wrapper::ThreadSafeLayoutNode<'a>>`,
    found `wrapper::ThreadSafeLayoutNode<'_>`
(expected enum `core::option::Option`,
    found struct `wrapper::ThreadSafeLayoutNode`) [E0308]
/Users/servo/buildbot/slave/mac1/build/components/layout/wrapper.rs:982                         Some(first) => self.parent_node.new_with_this_lifetime(&first),
                                                                                                               ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
note: in expansion of if let expansion
/Users/servo/buildbot/slave/mac1/build/components/layout/wrapper.rs:978:9: 1016:10 note: expansion site
/Users/servo/buildbot/slave/mac1/build/components/layout/wrapper.rs:982:40: 982:87 help: run `rustc --explain E0308` to see a detailed explanation
error: aborting due to previous error

@jdm jdm added S-needs-code-changes Changes have not yet been made that were requested by a reviewer. and removed S-awaiting-review There is new code that needs to be reviewed. labels Jul 21, 2015
@Ms2ger Ms2ger force-pushed the ThreadSafeLayoutNodeChildrenIterator branch from ec098f5 to 930e111 Compare July 21, 2015 17:59
@highfive highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-needs-code-changes Changes have not yet been made that were requested by a reviewer. labels Jul 21, 2015
@Ms2ger
Copy link
Contributor Author

Ms2ger commented Jul 21, 2015

@bors-servo r=pcwalton

@bors-servo
Copy link
Contributor

📌 Commit 930e111 has been approved by pcwalton

@bors-servo
Copy link
Contributor

⌛ Testing commit 930e111 with merge 1446b01...

bors-servo pushed a commit that referenced this pull request Jul 21, 2015
Auto merge of #6657 - Ms2ger:ThreadSafeLayoutNodeChildrenIterator, r=…
1446b01 
…pcwalton

Cleanup ThreadSafeLayoutNodeChildrenIterator.



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6657)
<!-- Reviewable:end -->
@jdm jdm added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Jul 21, 2015
@bors-servo
Copy link
Contributor

💔 Test failed - mac3

@jdm
Copy link
Member

jdm commented Jul 21, 2015

@bors-servo: retry

@bors-servo
Copy link
Contributor

⌛ Testing commit 930e111 with merge b1c4862...

bors-servo pushed a commit that referenced this pull request Jul 21, 2015
Auto merge of #6657 - Ms2ger:ThreadSafeLayoutNodeChildrenIterator, r=…
b1c4862 
…pcwalton

Cleanup ThreadSafeLayoutNodeChildrenIterator.



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

☀️ Test successful - android, gonk, linux1, linux2, linux3, mac1, mac2, mac3

@bors-servo bors-servo merged commit 930e111 into servo:master Jul 21, 2015
@Ms2ger Ms2ger deleted the ThreadSafeLayoutNodeChildrenIterator branch July 27, 2015 13:28
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-merge The PR is in the process of compiling and running tests on the automated CI.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@Ms2ger @highfive @hoppipolla-critic-bot @pcwalton @bors-servo @jdm