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 Temporary values in node iterators #5541

Merged
merged 4 commits into from Apr 7, 2015
Merged

Use Temporary values in node iterators #5541

merged 4 commits into from Apr 7, 2015

Conversation

@nox
Copy link
Member

nox commented Apr 6, 2015

No description provided.

@highfive
Copy link

highfive commented Apr 6, 2015

Thanks for the pull request, and welcome! The Servo team is excited to review your changes, and you should hear from @mbrubeck (or someone else) soon.
@highfive
Copy link

highfive commented Apr 6, 2015

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
@nox nox force-pushed the nox:node-iterators-temporary branch from 5411f56 to f0c02b1 Apr 6, 2015
@jdm jdm self-assigned this Apr 6, 2015
@jdm jdm closed this Apr 6, 2015
@jdm jdm reopened this Apr 6, 2015
@jgraham jgraham closed this Apr 6, 2015
@jgraham jgraham reopened this Apr 6, 2015
@hoppipolla-critic-bot
Copy link

hoppipolla-critic-bot commented Apr 6, 2015

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

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.
@nox nox mentioned this pull request Apr 6, 2015
Closed
@bors-servo
Copy link
Contributor

bors-servo commented Apr 7, 2015

☔ The latest upstream changes (presumably #5338) made this pull request unmergeable. Please resolve the merge conflicts.
@nox nox force-pushed the nox:node-iterators-temporary branch from 5ea2bd5 to 5cf3efd Apr 7, 2015
nox added 2 commits Apr 5, 2015
@nox
Add casts to Temporary types
fc31aef
@nox
Hold a Temporary in ReverseChildrenIterator
6a6ecb9
@nox
Copy link
Member Author

nox commented Apr 7, 2015

There are conflicts so I must rebase. I'll remove TreeIterator from that PR because it can't store a RootedVec<JS<…>> nor a Vec<Temporary<…>> and it needs a different solution.
@jdm jdm added the S-needs-rebase label Apr 7, 2015
nox added 2 commits Apr 5, 2015
@nox
Hold a Temporary in AncestorIterator
bf7c791
@nox
Use Temporary in ChildElementIterator
Loading status checks…
11b4ff9
@nox nox force-pushed the nox:node-iterators-temporary branch from 5cf3efd to 11b4ff9 Apr 7, 2015
@jdm
Copy link
Member

jdm commented Apr 7, 2015

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

bors-servo commented Apr 7, 2015

📌 Commit 11b4ff9 has been approved by jdm
@bors-servo
Copy link
Contributor

bors-servo commented Apr 7, 2015

⌛ Testing commit 11b4ff9 with merge e576307...
bors-servo pushed a commit that referenced this pull request Apr 7, 2015
bors-servo
Auto merge of #5541 - nox:node-iterators-temporary, r=jdm
Loading status checks…
e576307
@bors-servo
Copy link
Contributor

bors-servo commented Apr 7, 2015

☀️ Test successful - android, gonk, linux1, linux2, mac1, mac2
@bors-servo bors-servo merged commit 11b4ff9 into servo:master Apr 7, 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 Apr 7, 2015
Merged
@nox nox deleted the nox:node-iterators-temporary branch Aug 20, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jdm jdm

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