From cf34d78315fa5e46e71124f88cdceaebe2a052be Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Mon, 1 May 2017 19:07:20 +0200 Subject: [PATCH 1/2] Revert "Auto merge of #182 - waywardmonkeys:rename-to-uint, r=kvark" This reverts commit 78bbebb92e73b74d7f91e20ad48f01c8919bb44e, reversing changes made to e30da731b429a72bc0fd35e15de56d6d7d6fa487. --- src/point.rs | 6 +++--- src/rect.rs | 2 +- src/size.rs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/point.rs b/src/point.rs index 8e6986a..6239fbe 100644 --- a/src/point.rs +++ b/src/point.rs @@ -254,7 +254,7 @@ impl TypedPoint2D { /// When casting from floating point points, it is worth considering whether /// to `round()`, `ceil()` or `floor()` before the cast in order to obtain /// the desired conversion behavior. - pub fn to_usize(&self) -> TypedPoint2D { + pub fn to_uint(&self) -> TypedPoint2D { self.cast().unwrap() } @@ -517,7 +517,7 @@ impl TypedPoint3D { /// When casting from floating point points, it is worth considering whether /// to `round()`, `ceil()` or `floor()` before the cast in order to obtain /// the desired conversion behavior. - pub fn to_usize(&self) -> TypedPoint3D { + pub fn to_uint(&self) -> TypedPoint3D { self.cast().unwrap() } @@ -756,7 +756,7 @@ impl TypedPoint4D { /// When casting from floating point points, it is worth considering whether /// to `round()`, `ceil()` or `floor()` before the cast in order to obtain /// the desired conversion behavior. - pub fn to_usize(&self) -> TypedPoint4D { + pub fn to_uint(&self) -> TypedPoint4D { self.cast().unwrap() } diff --git a/src/rect.rs b/src/rect.rs index 6d759b1..835c1b5 100644 --- a/src/rect.rs +++ b/src/rect.rs @@ -404,7 +404,7 @@ impl TypedRect { /// When casting from floating point rectangles, it is worth considering whether /// to `round()`, `round_in()` or `round_out()` before the cast in order to /// obtain the desired conversion behavior. - pub fn to_usize(&self) -> TypedRect { + pub fn to_uint(&self) -> TypedRect { self.cast().unwrap() } diff --git a/src/size.rs b/src/size.rs index 0a97e4a..3b5288f 100644 --- a/src/size.rs +++ b/src/size.rs @@ -204,7 +204,7 @@ impl TypedSize2D { /// When casting from floating point sizes, it is worth considering whether /// to `round()`, `ceil()` or `floor()` before the cast in order to obtain /// the desired conversion behavior. - pub fn to_usize(&self) -> TypedSize2D { + pub fn to_uint(&self) -> TypedSize2D { self.cast().unwrap() } From f2b23df017327e8470ab8f92f64498886e8ed58f Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Mon, 1 May 2017 19:07:26 +0200 Subject: [PATCH 2/2] Bump version to 0.11.3 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index f73f34c..f628a08 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "euclid" -version = "0.11.2" +version = "0.11.3" authors = ["The Servo Project Developers"] description = "Geometry primitives" documentation = "https://docs.rs/euclid/"