auto merge of #5256 : servo/servo/rustup_20150311, r=jdm

...v.

Relies on:
* https://github.com/servo/rust-geom/pull/72
* https://github.com/servo/rust-glx/pull/10
* https://github.com/servo/gleam/pull/15
* https://github.com/servo/rust-mozjs/pull/137
* https://github.com/servo/rust-core-text/pull/35
* https://github.com/servo/rust-io-surface/pull/28

1 files changed, 3 insertions, 3 deletions

diff --git a/components/util/geometry.rs b/components/util/geometry.rs
index f67859b4503..05b1469a1b1 100644
--- a/components/util/geometry.rs
+++ b/components/util/geometry.rs
@@ -132,7 +132,7 @@ impl Add for Au {
     fn add(self, other: Au) -> Au {
         let Au(s) = self;
         let Au(o) = other;
-        Au(s + o)
+        Au(s.wrapping_add(o))
     }
 }
 
@@ -143,7 +143,7 @@ impl Sub for Au {
     fn sub(self, other: Au) -> Au {
         let Au(s) = self;
         let Au(o) = other;
-        Au(s - o)
+        Au(s.wrapping_sub(o))
     }
 
 }
@@ -154,7 +154,7 @@ impl Mul<i32> for Au {
     #[inline]
     fn mul(self, other: i32) -> Au {
         let Au(s) = self;
-        Au(s * other)
+        Au(s.wrapping_mul(other))
     }
 }