Skip to content
This repository has been archived by the owner on Jun 8, 2020. It is now read-only.

Bump euclid to 0.14 #264

Merged
merged 2 commits into from
Jun 8, 2017
Merged

Bump euclid to 0.14 #264

merged 2 commits into from
Jun 8, 2017

Conversation

nical
Copy link
Contributor

@nical nical commented Jun 2, 2017

In order for this to build we need servo-skia to be published on crates.io.


This change is Reviewable

@jdm
Copy link
Member

jdm commented Jun 2, 2017

error[E0308]: mismatched types

   --> src/azure_hl.rs:739:71

    |

739 |                                               &AzPoint::from_point_2d(offset),

    |                                                                       ^^^^^^ expected struct `euclid::TypedPoint2D`, found struct `euclid::TypedVector2D`

    |

    = note: expected type `&euclid::TypedPoint2D<f32, euclid::UnknownUnit>`

               found type `&euclid::TypedVector2D<f32, euclid::UnknownUnit>`

    = help: here are some functions which might fulfill your needs:

            - .length()

            - .square_length()

error[E0308]: mismatched types

   --> src/azure_hl.rs:739:71

    |

739 |                                               &AzPoint::from_point_2d(offset),

    |                                                                       ^^^^^^ expected struct `euclid::TypedPoint2D`, found struct `euclid::TypedVector2D`

    |

    = note: expected type `&euclid::TypedPoint2D<f32, euclid::UnknownUnit>`

               found type `&euclid::TypedVector2D<f32, euclid::UnknownUnit>`

    = help: here are some functions which might fulfill your needs:

            - .length()

            - .square_length()

error: aborting due to previous error

error: Could not compile `azure`.

@nical
Copy link
Contributor Author

nical commented Jun 7, 2017

This should be in a good state now, r? @jdm

Copy link
Contributor

@nox nox left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2 requests, 1 question. Otherwise r=me.

src/azure_hl.rs Outdated
@@ -1781,6 +1793,13 @@ impl AzPoint {
y: point.y,
}
}

fn from_vector_2d(point: &Vector2D<AzFloat>) -> Self {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why aren't the from_ methods From impls?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No idea, I really just followed whatever was already in place (but asked myself the same question), there's also something very similar in the servo repo in the code that interacts with azure (something that should just use From/Into).

src/azure_hl.rs Outdated
// Azure does not have a separation between points and vectors, AzPoint is used
// to represent both
impl AsAzurePoint for Vector2D<AzFloat> {
fn as_azure_point(&self) -> AzPoint {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#[inline]

src/azure_hl.rs Outdated
@@ -1781,6 +1793,13 @@ impl AzPoint {
y: point.y,
}
}

fn from_vector_2d(point: &Vector2D<AzFloat>) -> Self {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#[inline]

@nox
Copy link
Contributor

nox commented Jun 8, 2017

@bors-servo delegate+

@bors-servo
Copy link

✌️ @nical can now approve this pull request

@nical
Copy link
Contributor Author

nical commented Jun 8, 2017

@bors-servo r=nox

@bors-servo
Copy link

📌 Commit cdb257c has been approved by nox

@bors-servo
Copy link

⌛ Testing commit cdb257c with merge 3944a65...

bors-servo pushed a commit that referenced this pull request Jun 8, 2017
Bump euclid to 0.14

In order for this to build we need servo-skia to be published on crates.io.

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

☀️ Test successful - status-travis
Approved by: nox
Pushing 3944a65 to master...

@bors-servo bors-servo merged commit cdb257c into servo:master Jun 8, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants