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

Make generic version of Matrix4D (issue #125) #126

Merged
merged 1 commit into from Mar 7, 2016

Conversation

@peterjoel
Copy link
Contributor

peterjoel commented Feb 26, 2016

Matrix2D and the point types are already generic, so there was nothing to do there.

Review on Reviewable

@bors-servo
Copy link
Contributor

bors-servo commented Feb 27, 2016

The latest upstream changes (presumably #129) made this pull request unmergeable. Please resolve the merge conflicts.

@jdm
Copy link
Member

jdm commented Feb 27, 2016

r? @glennw

@peterjoel peterjoel force-pushed the peterjoel:issue_125 branch from 174a450 to bccb1e7 Feb 27, 2016
@bors-servo
Copy link
Contributor

bors-servo commented Mar 3, 2016

The latest upstream changes (presumably #131) made this pull request unmergeable. Please resolve the merge conflicts.

@glennw
Copy link
Member

glennw commented Mar 3, 2016

Apologies I haven't got to this yet - will review tomorrow.

@glennw
Copy link
Member

glennw commented Mar 3, 2016

@peterjoel This looks good to me, just needs a rebase. Thanks!

@peterjoel peterjoel force-pushed the peterjoel:issue_125 branch from bccb1e7 to 9766e26 Mar 3, 2016
@peterjoel
Copy link
Contributor Author

peterjoel commented Mar 4, 2016

@glennw Done.

@glennw
Copy link
Member

glennw commented Mar 4, 2016

@peterjoel GH still thinks this branch is unmergeable?

@peterjoel peterjoel force-pushed the peterjoel:issue_125 branch from 9766e26 to b8166e2 Mar 4, 2016
@peterjoel
Copy link
Contributor Author

peterjoel commented Mar 4, 2016

@glennw Actually done now! I was getting confused between git remotes.

You may need to check it over again though, since the merge was a bit annoying - changes were made in the Matrix methods that in the meantime I'd moved to another file. I did the merge manually, based on looking at the commits that touched that file, which appeared to be only two additional #[inline] attributes.

@glennw
Copy link
Member

glennw commented Mar 7, 2016

Reviewed 3 of 4 files at r3, 1 of 2 files at r4.
Review status: all files reviewed at latest revision, all discussions resolved.


Comments from the review on Reviewable.io

@glennw
Copy link
Member

glennw commented Mar 7, 2016

@jdm
Copy link
Member

jdm commented Mar 7, 2016

@bors-servo: r=glennw

@bors-servo
Copy link
Contributor

bors-servo commented Mar 7, 2016

📌 Commit b8166e2 has been approved by glennw

@bors-servo
Copy link
Contributor

bors-servo commented Mar 7, 2016

Testing commit b8166e2 with merge 37e77bf...

bors-servo added a commit that referenced this pull request Mar 7, 2016
Make generic version of Matrix4D (issue #125)

Matrix2D and the point types are already generic, so there was nothing to do there.

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

bors-servo commented Mar 7, 2016

☀️ Test successful - travis

@bors-servo bors-servo merged commit b8166e2 into servo:master Mar 7, 2016
3 checks passed
3 checks passed
code-review/reviewable Review complete: all files reviewed, all discussions resolved
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@nox nox mentioned this pull request Mar 27, 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

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