Merge pull request #140 from mrannanj/master

update to compile on nightly
This commit is contained in:
Corey Richardson 2014-11-20 10:19:10 -05:00
commit 0fa3008fa5
2 changed files with 2 additions and 2 deletions

View file

@ -88,7 +88,7 @@ impl BaseInt for u64 {}
impl BaseInt for uint {} impl BaseInt for uint {}
/// Base floating point types /// Base floating point types
pub trait BaseFloat : BaseNum + FloatMath + ApproxEq<Self> + fmt::Float {} pub trait BaseFloat : BaseNum + FloatMath + ApproxEq<Self> {}
impl BaseFloat for f32 {} impl BaseFloat for f32 {}
impl BaseFloat for f64 {} impl BaseFloat for f64 {}

View file

@ -132,7 +132,7 @@ ApproxEq<S> for Plane<S> {
impl<S: BaseFloat> fmt::Show for Plane<S> { impl<S: BaseFloat> fmt::Show for Plane<S> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "{:f}x + {:f}y + {:f}z - {:f} = 0", write!(f, "{}x + {}y + {}z - {} = 0",
self.n.x, self.n.y, self.n.z, self.d) self.n.x, self.n.y, self.n.z, self.d)
} }
} }