diff --git a/src/point.rs b/src/point.rs index 06d2c07..e5c2494 100644 --- a/src/point.rs +++ b/src/point.rs @@ -11,7 +11,7 @@ use length::Length; use size::Size2D; use num::Zero; -use std::fmt; +use std::fmt::{self, Formatter}; use std::num::NumCast; use std::ops::{Add, Neg, Mul, Sub, Div}; @@ -33,6 +33,13 @@ impl fmt::Debug for Point2D { } } +impl fmt::Display for Point2D { + fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result { + write!(formatter, "({},{})", self.x, self.y); + Ok(()) + } +} + pub fn Point2D(x: T, y: T) -> Point2D { Point2D {x: x, y: y} } diff --git a/src/rect.rs b/src/rect.rs index 504d8fd..7e0a8c0 100644 --- a/src/rect.rs +++ b/src/rect.rs @@ -13,7 +13,7 @@ use num::Zero; use point::Point2D; use size::Size2D; use std::cmp::PartialOrd; -use std::fmt; +use std::fmt::{self, Formatter}; use std::num::NumCast; use std::ops::{Add, Sub, Mul, Div}; @@ -29,6 +29,13 @@ impl fmt::Debug for Rect { } } +impl fmt::Display for Rect { + fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result { + write!(formatter, "Rect({} at {})", self.size.to_string(), self.origin.to_string()); + Ok(()) + } +} + pub fn Rect(origin: Point2D, size: Size2D) -> Rect { Rect { origin: origin, diff --git a/src/size.rs b/src/size.rs index 75740b2..e34a218 100644 --- a/src/size.rs +++ b/src/size.rs @@ -10,7 +10,7 @@ use length::Length; use num::Zero; -use std::fmt; +use std::fmt::{self, Formatter}; use std::num::NumCast; use std::ops::{Mul, Div}; @@ -26,6 +26,13 @@ impl fmt::Debug for Size2D { } } +impl fmt::Display for Size2D { + fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result { + write!(formatter, "({}x{})", self.width, self.height); + Ok(()) + } +} + pub fn Size2D(width: T, height: T) -> Size2D { Size2D { width: width,