Skip to content

/ euclid

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

From points iterator #256

Merged
merged 1 commit into from Jan 3, 2018
Merged

From points iterator #256

merged 1 commit into from Jan 3, 2018

Conversation

@TyOverby
Copy link
Contributor

TyOverby commented Dec 31, 2017 •
edited by larsbergstrom

This change is Reviewable
@TyOverby
Copy link
Contributor Author

TyOverby commented Dec 31, 2017

@nical: Does this conflict with whatever changes you alluded to in #255?
@nical
Copy link
Collaborator

nical commented Jan 1, 2018 •
edited

@nical: Does this conflict with whatever changes you alluded to in #255?

It doesn't, you'll just have to rebase on top of the patch that adds the comments (I'll merge it shortly).
@bors-servo
Copy link
Contributor

bors-servo commented Jan 1, 2018

☔ The latest upstream changes (presumably #255) made this pull request unmergeable. Please resolve the merge conflicts.
@nical
Copy link
Collaborator

nical commented Jan 3, 2018

Th PR looks good although it appears that it still needs a rebase.
@TyOverby
from_points can take an iterator instead of just a slice
Loading status checks…
88265bb
@TyOverby TyOverby force-pushed the TyOverby:from_points-iterator branch from d7f88e2 to 88265bb Jan 3, 2018
@TyOverby
Copy link
Contributor Author

TyOverby commented Jan 3, 2018

@nical: done
@nical
Copy link
Collaborator

nical commented Jan 3, 2018

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

bors-servo commented Jan 3, 2018

📌 Commit 88265bb has been approved by nical
@bors-servo
Copy link
Contributor

bors-servo commented Jan 3, 2018

⌛ Testing commit 88265bb with merge ca9fac9...
bors-servo added a commit that referenced this pull request Jan 3, 2018
@bors-servo
Auto merge of #256 - TyOverby:from_points-iterator, r=nical
Loading status checks…
ca9fac9 
From points iterator

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

bors-servo commented Jan 3, 2018

☀️ Test successful - status-travis
Approved by: nical
Pushing ca9fac9 to master...
@bors-servo bors-servo merged commit 88265bb into servo:master Jan 3, 2018
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@pyfisch
Copy link
Contributor

pyfisch commented Jan 4, 2018

This PR adds an empty "rls1514761716760.log" file. Was this on purpose?
@nical
Copy link
Collaborator

nical commented Jan 4, 2018

Oops probably not. Thanks for catching that, let's remove it.
nical added a commit that referenced this pull request Jan 4, 2018
@nical
Delete rls1514761716760.log
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…
e7e610c 
The file was accidentally added in #256.
@nical nical mentioned this pull request Jan 4, 2018
Merged
bors-servo added a commit that referenced this pull request Jan 4, 2018
@bors-servo
Auto merge of #257 - servo:rm-rls-log-file, r=SimonSapin
Loading status checks…
aa55be3 
Delete rls1514761716760.log

The file was accidentally added in #256.

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

TyOverby commented Jan 4, 2018

That was not intentional. Sorry about that!
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
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
@TyOverby @nical @bors-servo @pyfisch
You can’t perform that action at this time.