Skip to content

Commit

Permalink
Auto merge of #194 - nical:matrix-name, r=kvark
Browse files Browse the repository at this point in the history
Rename Matrix2D/4D into Transform2D/3D

Fixes #160.

<!-- 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/194)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo authored May 21, 2017
2 parents 5f796a1 + c409c9d commit 94799b6
Show file tree
Hide file tree
Showing 3 changed files with 207 additions and 192 deletions.
25 changes: 21 additions & 4 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ extern crate num_traits;

pub use length::Length;
pub use scale_factor::ScaleFactor;
pub use matrix2d::{Matrix2D, TypedMatrix2D};
pub use matrix4d::{Matrix4D, TypedMatrix4D};
pub use transform2d::{Transform2D, TypedTransform2D};
pub use transform3d::{Transform3D, TypedTransform3D};
pub use point::{
Point2D, TypedPoint2D,
Point3D, TypedPoint3D,
Expand All @@ -85,8 +85,8 @@ pub mod approxeq;
pub mod length;
#[macro_use]
mod macros;
pub mod matrix2d;
pub mod matrix4d;
pub mod transform2d;
pub mod transform3d;
pub mod num;
pub mod point;
pub mod rect;
Expand All @@ -110,3 +110,20 @@ pub type Radians<T> = Length<T, Rad>;

/// A value in Degrees.
pub type Degrees<T> = Length<T, Deg>;

/// Temporary alias to facilitate the transition to the new naming scheme
#[deprecated]
pub type Matrix2D<T> = Transform2D<T>;

/// Temporary alias to facilitate the transition to the new naming scheme
#[deprecated]
pub type TypedMatrix2D<T, Src, Dst> = TypedTransform2D<T, Src, Dst>;

/// Temporary alias to facilitate the transition to the new naming scheme
#[deprecated]
pub type Matrix4D<T> = Transform3D<T>;

/// Temporary alias to facilitate the transition to the new naming scheme
#[deprecated]
pub type TypedMatrix4D<T, Src, Dst> = TypedTransform3D<T, Src, Dst>;

Loading

0 comments on commit 94799b6

Please sign in to comment.