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.

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

Simplify next_fragment and fix obsolete docs #6445

Merged
merged 1 commit into from Jun 22, 2015

Conversation

@mbrubeck
Copy link
Contributor

mbrubeck commented Jun 22, 2015

@hoppipolla-critic-bot
Copy link

hoppipolla-critic-bot commented Jun 22, 2015

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

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.

}

Some(fragment)
self.work_list.pop_front().or(old_fragment_iter.next())

This comment has been minimized.

Copy link
@pcwalton

pcwalton Jun 22, 2015

Contributor

This will unconditionally call old_fragment_iter.next(). Is that what you intended?

@mbrubeck mbrubeck force-pushed the mbrubeck:next_fragment branch from b9f9b50 to a3b339c Jun 22, 2015
@mbrubeck
Copy link
Contributor Author

mbrubeck commented Jun 22, 2015

This will unconditionally call old_fragment_iter.next(). Is that what you intended?

No, good catch. Fixed.

@pcwalton
Copy link
Contributor

pcwalton commented Jun 22, 2015

@bors-servo
Copy link
Contributor

bors-servo commented Jun 22, 2015

📌 Commit a3b339c has been approved by pcwalton

@bors-servo
Copy link
Contributor

bors-servo commented Jun 22, 2015

Testing commit a3b339c with merge d86c587...

bors-servo pushed a commit that referenced this pull request Jun 22, 2015
Simplify next_fragment and fix obsolete docs

r? @pcwalton

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

bors-servo commented Jun 22, 2015

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

@bors-servo bors-servo merged commit a3b339c into servo:master Jun 22, 2015
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@mbrubeck mbrubeck deleted the mbrubeck:next_fragment branch May 11, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.