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

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 commented Jul 18, 2015

Review on Reviewable
@highfive
Copy link

highfive commented Jul 18, 2015

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
@hoppipolla-critic-bot
Copy link

hoppipolla-critic-bot commented Jul 18, 2015

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
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 Ms2ger:ThreadSafeLayoutNodeChildrenIterator branch from 9c5c8c0 to ec098f5 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

pcwalton commented Jul 21, 2015

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

bors-servo commented Jul 21, 2015

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

bors-servo commented Jul 21, 2015

⌛ Testing commit ec098f5 with merge b3d92e7...
bors-servo pushed a commit that referenced this pull request Jul 21, 2015
bors-servo
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

bors-servo commented Jul 21, 2015

💔 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
Ms2ger added 2 commits Jul 17, 2015
@Ms2ger
Simplify ThreadSafeLayoutNodeChildrenIterator::next().
b3892b7
@Ms2ger
Scope ThreadSafeLayoutNode::first_child to ThreadSafeLayoutNodeChildr…
Loading status checks…
930e111 
…enIterator::new.

It is only used there.
@Ms2ger Ms2ger force-pushed the Ms2ger:ThreadSafeLayoutNodeChildrenIterator branch from ec098f5 to 930e111 Jul 21, 2015
@Ms2ger
Copy link
Contributor Author

Ms2ger commented Jul 21, 2015

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

bors-servo commented Jul 21, 2015

📌 Commit 930e111 has been approved by pcwalton
@bors-servo
Copy link
Contributor

bors-servo commented Jul 21, 2015

⌛ Testing commit 930e111 with merge 1446b01...
bors-servo pushed a commit that referenced this pull request Jul 21, 2015
bors-servo
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 -->
@bors-servo
Copy link
Contributor

bors-servo commented Jul 21, 2015

💔 Test failed - mac3
@jdm
Copy link
Member

jdm commented Jul 21, 2015

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

bors-servo commented Jul 21, 2015

⌛ Testing commit 930e111 with merge b1c4862...
bors-servo pushed a commit that referenced this pull request Jul 21, 2015
bors-servo
Auto merge of #6657 - Ms2ger:ThreadSafeLayoutNodeChildrenIterator, r=…
Loading status checks…
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

bors-servo commented Jul 21, 2015

☀️ Test successful - android, gonk, linux1, linux2, linux3, mac1, mac2, mac3
@bors-servo bors-servo merged commit 930e111 into servo:master Jul 21, 2015
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@Ms2ger Ms2ger deleted the Ms2ger:ThreadSafeLayoutNodeChildrenIterator branch Jul 27, 2015
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
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
@Ms2ger @highfive @hoppipolla-critic-bot @pcwalton @bors-servo @jdm
You can’t perform that action at this time.