From eb40fbce2a4507362d1a8e108ef2f54f3e097e68 Mon Sep 17 00:00:00 2001
From: ozkriff <ozkriff@gmail.com>
Date: Tue, 25 Feb 2014 12:56:22 +0400
Subject: [PATCH] Updated to latest Rust: ToStr -> fmt::Show

---
 src/cgmath/aabb.rs       | 12 ++++++------
 src/cgmath/angle.rs      | 15 +++++++++++++--
 src/cgmath/plane.rs      |  6 +++---
 src/cgmath/point.rs      | 12 ++++++------
 src/cgmath/quaternion.rs | 10 +++++++---
 src/cgmath/transform.rs  | 10 +++++-----
 src/cgmath/vector.rs     | 18 +++++++++---------
 7 files changed, 49 insertions(+), 34 deletions(-)

diff --git a/src/cgmath/aabb.rs b/src/cgmath/aabb.rs
index 0bd26b6..5aa6fdf 100644
--- a/src/cgmath/aabb.rs
+++ b/src/cgmath/aabb.rs
@@ -93,9 +93,9 @@ impl<S: Primitive> Aabb<S, Vec2<S>, Point2<S>, [S, ..2]> for Aabb2<S> {
     #[inline] fn max<'a>(&'a self) -> &'a Point2<S> { &self.max }
 }
 
-impl<S: fmt::Show> ToStr for Aabb2<S> {
-    fn to_str(&self) -> ~str {
-        format!("[{} - {}]", self.min.to_str(), self.max.to_str())
+impl<S: fmt::Show> fmt::Show for Aabb2<S> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f.buf, "[{} - {}]", self.min, self.max)
     }
 }
 
@@ -122,8 +122,8 @@ impl<S: Primitive> Aabb<S, Vec3<S>, Point3<S>, [S, ..3]> for Aabb3<S> {
     #[inline] fn max<'a>(&'a self) -> &'a Point3<S> { &self.max }
 }
 
-impl<S: fmt::Show> ToStr for Aabb3<S> {
-    fn to_str(&self) -> ~str {
-        format!("[{} - {}]", self.min.to_str(), self.max.to_str())
+impl<S: fmt::Show> fmt::Show for Aabb3<S> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f.buf, "[{} - {}]", self.min, self.max)
     }
 }
diff --git a/src/cgmath/angle.rs b/src/cgmath/angle.rs
index 98feeec..afbd140 100644
--- a/src/cgmath/angle.rs
+++ b/src/cgmath/angle.rs
@@ -204,8 +204,19 @@ Angle<S> for Deg<S> {
 #[inline] pub fn atan<S: Float>(s: S) -> Rad<S> { rad(s.atan()) }
 #[inline] pub fn atan2<S: Float>(a: S, b: S) -> Rad<S> { rad(a.atan2(&b)) }
 
-impl<S: Float + fmt::Show> ToStr for Rad<S> { fn to_str(&self) -> ~str { format!("{} rad", self.s) } }
-impl<S: Float + fmt::Show> ToStr for Deg<S> { fn to_str(&self) -> ~str { format!("{}°", self.s) } }
+impl<S: Float + fmt::Show>
+fmt::Show for Rad<S> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f.buf, "{} rad", self.s)
+    }
+}
+
+impl<S: Float + fmt::Show>
+fmt::Show for Deg<S> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f.buf, "{}°", self.s)
+    }
+}
 
 impl<S: Float + ApproxEq<S>>
 ApproxEq<S> for Rad<S> {
diff --git a/src/cgmath/plane.rs b/src/cgmath/plane.rs
index 5b3f392..a18d2d9 100644
--- a/src/cgmath/plane.rs
+++ b/src/cgmath/plane.rs
@@ -121,9 +121,9 @@ ApproxEq<S> for Plane<S> {
     }
 }
 
-impl<S: Clone + fmt::Float> ToStr for Plane<S> {
-    fn to_str(&self) -> ~str {
-        format!("{:f}x + {:f}y + {:f}z - {:f} = 0",
+impl<S: Clone + fmt::Float> fmt::Show for Plane<S> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f.buf, "{:f}x + {:f}y + {:f}z - {:f} = 0",
                 self.n.x,
                 self.n.y,
                 self.n.z,
diff --git a/src/cgmath/point.rs b/src/cgmath/point.rs
index 0a34e97..8a68c74 100644
--- a/src/cgmath/point.rs
+++ b/src/cgmath/point.rs
@@ -99,14 +99,14 @@ array!(impl<S> Point3<S> -> [S, ..3] _3)
 impl<S: Primitive> Point<S, Vec2<S>, [S, ..2]> for Point2<S> {}
 impl<S: Primitive> Point<S, Vec3<S>, [S, ..3]> for Point3<S> {}
 
-impl<S: fmt::Show> ToStr for Point2<S> {
-    fn to_str(&self) -> ~str {
-        format!("[{}, {}]", self.x, self.y)
+impl<S: fmt::Show> fmt::Show for Point2<S> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f.buf, "[{}, {}]", self.x, self.y)
     }
 }
 
-impl<S: fmt::Show> ToStr for Point3<S> {
-    fn to_str(&self) -> ~str {
-        format!("[{}, {}, {}]", self.x, self.y, self.z)
+impl<S: fmt::Show> fmt::Show for Point3<S> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f.buf, "[{}, {}, {}]", self.x, self.y, self.z)
     }
 }
diff --git a/src/cgmath/quaternion.rs b/src/cgmath/quaternion.rs
index 6c4f0b9..da76ab7 100644
--- a/src/cgmath/quaternion.rs
+++ b/src/cgmath/quaternion.rs
@@ -287,9 +287,13 @@ Neg<Quat<S>> for Quat<S> {
     }
 }
 
-impl<S: fmt::Show> ToStr for Quat<S> {
-    fn to_str(&self) -> ~str {
-        format!("{} + {}i + {}j + {}k", self.s, self.v.x, self.v.y, self.v.z)
+impl<S: fmt::Show> fmt::Show for Quat<S> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f.buf, "{} + {}i + {}j + {}k",
+                self.s,
+                self.v.x,
+                self.v.y,
+                self.v.z)
     }
 }
 
diff --git a/src/cgmath/transform.rs b/src/cgmath/transform.rs
index 6a001b6..253d879 100644
--- a/src/cgmath/transform.rs
+++ b/src/cgmath/transform.rs
@@ -157,11 +157,11 @@ ToMat4<S> for Decomposed<S, Vec3<S>, R> {
 impl<S: Float + ApproxEq<S>, R: Rotation3<S>>
 Transform3<S> for Decomposed<S,Vec3<S>,R> {}
 
-impl<S: fmt::Show + Float, R: ToStr + Rotation3<S>>
-ToStr for Decomposed<S,Vec3<S>,R> {
-    fn to_str(&self) -> ~str {
-        format!("(scale({}), rot({:s}), disp{:s})",
-            self.scale, self.rot.to_str(), self.disp.to_str())
+impl<S: fmt::Show + Float, R: fmt::Show + Rotation3<S>>
+fmt::Show for Decomposed<S,Vec3<S>,R> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f.buf, "(scale({}), rot({}), disp{})",
+            self.scale, self.rot, self.disp)
     }
 }
 
diff --git a/src/cgmath/vector.rs b/src/cgmath/vector.rs
index 3582a80..d5d4f76 100644
--- a/src/cgmath/vector.rs
+++ b/src/cgmath/vector.rs
@@ -302,20 +302,20 @@ EuclideanVector<S, [S, ..4]> for Vec4<S> {
     }
 }
 
-impl<S: fmt::Show> ToStr for Vec2<S> {
-    fn to_str(&self) -> ~str {
-        format!("[{}, {}]", self.x, self.y)
+impl<S: fmt::Show> fmt::Show for Vec2<S> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f.buf, "[{}, {}]", self.x, self.y)
     }
 }
 
-impl<S: fmt::Show> ToStr for Vec3<S> {
-    fn to_str(&self) -> ~str {
-        format!("[{}, {}, {}]", self.x, self.y, self.z)
+impl<S: fmt::Show> fmt::Show for Vec3<S> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f.buf, "[{}, {}, {}]", self.x, self.y, self.z)
     }
 }
 
-impl<S: fmt::Show> ToStr for Vec4<S> {
-    fn to_str(&self) -> ~str {
-        format!("[{}, {}, {}, {}]", self.x, self.y, self.z, self.w)
+impl<S: fmt::Show> fmt::Show for Vec4<S> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f.buf, "[{}, {}, {}, {}]", self.x, self.y, self.z, self.w)
     }
 }