---

mvdnes · mvdnes · commit 426cb19eb455 · 2015-07-08T15:44:50.000+02:00
yaml --- r: 235283 b: refs/heads/stable c: a89b3ea h: refs/heads/master i: 235281: 7821f8e 235279: 9fb1eeb v: v3
diff --git a/[refs] b/[refs]
@@ -29,7 +29,7 @@ refs/heads/tmp: afae2ff723393b3ab4ccffef6ac7c6d1809e2da0
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: f859507de8c410b648d934d8f5ec1c52daac971d
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: e333a57a1952bca66e8063f80d3b6915b90db06b
+refs/heads/stable: a89b3ea3fcf1cd4b24f86d223fcc8f09c0ea75a3
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
 refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e
diff --git a/branches/stable/src/libcore/num/wrapping.rs b/branches/stable/src/libcore/num/wrapping.rs
@@ -119,13 +119,13 @@ macro_rules! wrapping_impl {
             }
         }
 
-        #[stable(feature = "rust1", since = "1.3.0")]
+        #[stable(feature = "wrapping_div", since = "1.3.0")]
         impl Div for Wrapping<$t> {
             type Output = Wrapping<$t>;
 
             #[inline(always)]
             fn div(self, other: Wrapping<$t>) -> Wrapping<$t> {
-                Wrapping(self.0 / other.0)
+                Wrapping(self.0.wrapping_div(other.0))
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -119,13 +119,13 @@ macro_rules! wrapping_impl {`
`119`	`119`	`}`
`120`	`120`	`}`
`121`	`121`
`122`		`- #[stable(feature = "rust1", since = "1.3.0")]`
	`122`	`+ #[stable(feature = "wrapping_div", since = "1.3.0")]`
`123`	`123`	`impl Div for Wrapping<$t> {`
`124`	`124`	`type Output = Wrapping<$t>;`
`125`	`125`
`126`	`126`	`#[inline(always)]`
`127`	`127`	`fn div(self, other: Wrapping<$t>) -> Wrapping<$t> {`
`128`		`- Wrapping(self.0 / other.0)`
	`128`	`+ Wrapping(self.0.wrapping_div(other.0))`
`129`	`129`	`}`
`130`	`130`	`}`
`131`	`131`