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

Update num-traits to 0.2 and bump version #279

Merged
merged 1 commit into from Jul 20, 2018
Merged

Update num-traits to 0.2 and bump version #279

merged 1 commit into from Jul 20, 2018

Conversation

@Eijebong
Copy link
Member

Eijebong commented Mar 19, 2018 •
edited by larsbergstrom

This change is Reviewable
@Eijebong
Copy link
Member Author

Eijebong commented Mar 19, 2018

You might want to wait for this one since master had lots of changes recently. I'm not sure how long that whole num-traits update is going to take
@Eijebong Eijebong mentioned this pull request Mar 19, 2018
Closed
9 of 9 tasks complete
@bors-servo
Copy link
Contributor

bors-servo commented Mar 19, 2018

☔ The latest upstream changes (presumably #280) made this pull request unmergeable. Please resolve the merge conflicts.
@Eijebong
Copy link
Member Author

Eijebong commented Mar 19, 2018

Oh come on :o
@GabrielMajeri GabrielMajeri mentioned this pull request Jun 4, 2018
Merged
bors-servo added a commit that referenced this pull request Jun 4, 2018
@bors-servo
Auto merge of #289 - GabrielMajeri:master, r=kvark
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…
d155e0c 
Allow euclid to be built in no_std environments

(blocked on #279, since only `num-traits` > 0.2 is `no_std` compatible)

Since this crate does not use any `std`-specific features, this pull request makes it `no_std`.

The tests are still built and run using `std`.

<!-- 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/289)
<!-- Reviewable:end -->
@Eijebong Eijebong force-pushed the Eijebong:num-traits branch from 7e5665e to 854e2c4 Jun 7, 2018
@bors-servo
Copy link
Contributor

bors-servo commented Jul 9, 2018

☔ The latest upstream changes (presumably #297) made this pull request unmergeable. Please resolve the merge conflicts.
@Eijebong Eijebong force-pushed the Eijebong:num-traits branch from 854e2c4 to 49b7a02 Jul 20, 2018
@nical
Copy link
Collaborator

nical commented Jul 20, 2018

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

bors-servo commented Jul 20, 2018

📌 Commit 49b7a02 has been approved by nical
@bors-servo
Copy link
Contributor

bors-servo commented Jul 20, 2018

⌛ Testing commit 49b7a02 with merge ada409e...
bors-servo added a commit that referenced this pull request Jul 20, 2018
@bors-servo
Auto merge of #279 - Eijebong:num-traits, r=nical
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…
ada409e 
Update num-traits to 0.2 and bump version

<!-- 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/279)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jul 20, 2018

💔 Test failed - status-travis
@Eijebong
Update num-traits and bump version
Loading status checks…
704ff0c
@Eijebong Eijebong force-pushed the Eijebong:num-traits branch from 49b7a02 to 704ff0c Jul 20, 2018
@kvark
Copy link
Member

kvark commented Jul 20, 2018

use num_traits::{Float, NumCast};
^^^^^ no Float in the root. Did you mean to use float?

sounds like an error that could be caught locally ;)

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

bors-servo commented Jul 20, 2018

📌 Commit 704ff0c has been approved by nical
@bors-servo
Copy link
Contributor

bors-servo commented Jul 20, 2018

⌛ Testing commit 704ff0c with merge be4758c...
bors-servo added a commit that referenced this pull request Jul 20, 2018
@bors-servo
Auto merge of #279 - Eijebong:num-traits, r=nical
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…
be4758c 
Update num-traits to 0.2 and bump version

<!-- 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/279)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jul 20, 2018

☀️ Test successful - status-travis
Approved by: nical
Pushing be4758c to master...
@bors-servo bors-servo merged commit 704ff0c into servo:master Jul 20, 2018
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@Eijebong
Copy link
Member Author

Eijebong commented Jul 20, 2018 •
edited

@kvark Yeah that's what happens when I'm too lazy to rebase properly and trust my memory...
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
@Eijebong @bors-servo @nical @kvark
You can’t perform that action at this time.