From 8710b3525c47ce2d0bec8f326df42ed7e758b3c6 Mon Sep 17 00:00:00 2001
From: Ruud van Asseldonk <dev@veniogames.com>
Date: Wed, 19 Nov 2014 17:25:50 +0100
Subject: [PATCH] Fix errors after numerics reform

---
 src/approxeq.rs     | 5 +++--
 src/length.rs       | 2 +-
 src/point.rs        | 4 ++--
 src/rect.rs         | 4 ++--
 src/scale_factor.rs | 2 +-
 src/side_offsets.rs | 4 ++--
 src/size.rs         | 4 ++--
 7 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/approxeq.rs b/src/approxeq.rs
index ccd173a..ee1879f 100644
--- a/src/approxeq.rs
+++ b/src/approxeq.rs
@@ -1,4 +1,4 @@
-// Copyright 2013 The Servo Project Developers. See the COPYRIGHT
+// Copyright 2013-2014 The Servo Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution.
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
@@ -7,6 +7,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use std::num::Float;
 
 /// Trait for testing approximate equality
 pub trait ApproxEq<Eps> {
@@ -44,4 +45,4 @@ impl ApproxEq<f64> for f64 {
     fn approx_eq_eps(&self, other: &f64, approx_epsilon: &f64) -> bool {
         (*self - *other).abs() < *approx_epsilon
     }
-}
\ No newline at end of file
+}
diff --git a/src/length.rs b/src/length.rs
index 1185fb0..a9e002a 100644
--- a/src/length.rs
+++ b/src/length.rs
@@ -10,7 +10,7 @@
 
 use scale_factor::ScaleFactor;
 
-use std::num::{cast, Zero};
+use std::num::{cast, NumCast, Zero};
 
 /// A one-dimensional distance, with value represented by `T` and unit of measurement `Unit`.
 ///
diff --git a/src/point.rs b/src/point.rs
index 67730a6..8bfabda 100644
--- a/src/point.rs
+++ b/src/point.rs
@@ -1,4 +1,4 @@
-// Copyright 2013 The Servo Project Developers. See the COPYRIGHT
+// Copyright 2013-2014 The Servo Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution.
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
@@ -11,7 +11,7 @@ use length::Length;
 use size::Size2D;
 
 use std::fmt;
-use std::num::Zero;
+use std::num::{NumCast, Zero};
 
 #[deriving(Clone, Decodable, Encodable, Eq, Hash, PartialEq)]
 pub struct Point2D<T> {
diff --git a/src/rect.rs b/src/rect.rs
index edc6c5b..34dddde 100644
--- a/src/rect.rs
+++ b/src/rect.rs
@@ -1,4 +1,4 @@
-// Copyright 2013 The Servo Project Developers. See the COPYRIGHT
+// Copyright 2013-2014 The Servo Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution.
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
@@ -13,7 +13,7 @@ use point::Point2D;
 use size::Size2D;
 use std::cmp::{PartialEq, PartialOrd};
 use std::fmt;
-use std::num::Zero;
+use std::num::{NumCast, Zero};
 
 #[deriving(Clone, Decodable, Encodable, PartialEq)]
 pub struct Rect<T> {
diff --git a/src/scale_factor.rs b/src/scale_factor.rs
index 818c24f..8ec0453 100644
--- a/src/scale_factor.rs
+++ b/src/scale_factor.rs
@@ -8,7 +8,7 @@
 // except according to those terms.
 //! A type-checked scaling factor between units.
 
-use std::num::{cast, One};
+use std::num::{cast, NumCast, One};
 
 /// A scaling factor between two different units of measurement.
 ///
diff --git a/src/side_offsets.rs b/src/side_offsets.rs
index ee0cd4d..660e35d 100644
--- a/src/side_offsets.rs
+++ b/src/side_offsets.rs
@@ -1,4 +1,4 @@
-// Copyright 2013 The Servo Project Developers. See the COPYRIGHT
+// Copyright 2013-2014 The Servo Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution.
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
@@ -10,7 +10,7 @@
 //! A group of side offsets, which correspond to top/left/bottom/right for borders, padding,
 //! and margins in CSS.
 
-use std::num::Zero;
+use std::num::{Num, Zero};
 
 /// A group of side offsets, which correspond to top/left/bottom/right for borders, padding,
 /// and margins in CSS.
diff --git a/src/size.rs b/src/size.rs
index ff9fb3f..da29a93 100644
--- a/src/size.rs
+++ b/src/size.rs
@@ -1,4 +1,4 @@
-// Copyright 2013 The Servo Project Developers. See the COPYRIGHT
+// Copyright 2013-2014 The Servo Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution.
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
@@ -11,7 +11,7 @@ use length::Length;
 
 use std::cmp::PartialEq;
 use std::fmt;
-use std::num::Zero;
+use std::num::{NumCast, Zero};
 
 #[deriving(Clone, Decodable, Encodable, PartialEq)]
 pub struct Size2D<T> {