---

yaml
---
r: 234217
b: refs/heads/beta
c: 224023d
h: refs/heads/master
i:
  234215: e5e997c
v: v3

Author: sfackler

[refs]

@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: 9da7706dd64bbf055e3f32fe12286a521d8ac7ac
+refs/heads/beta: 224023dfd167afca95665ebf9f927fa1c301f950
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 370fe2786109360f7c35b8ba552b83b773dd71d6
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/libcore/num/mod.rs

@@ -537,21 +537,25 @@ macro_rules! int_impl {
             let mut base = self;
             let mut acc = Self::one();
 
-            while exp > 1 {
+            let mut prev_base = self;
+            let mut base_oflo = false;
+            while exp > 0 {
                 if (exp & 1) == 1 {
-                    acc = acc * base;
+                    if base_oflo {
+                        // ensure overflow occurs in the same manner it
+                        // would have otherwise (i.e. signal any exception
+                        // it would have otherwise).
+                        acc = acc * (prev_base * prev_base);
+                    } else {
+                        acc = acc * base;
+                    }
                 }
+                prev_base = base;
+                let (new_base, new_base_oflo) = base.overflowing_mul(base);
+                base = new_base;
+                base_oflo = new_base_oflo;
                 exp /= 2;
-                base = base * base;
-            }
-
-            // Deal with the final bit of the exponent separately, since
-            // squaring the base afterwards is not necessary and may cause a
-            // needless overflow.
-            if exp == 1 {
-                acc = acc * base;
             }
-
             acc
         }
 

branches/beta/src/libstd/net/tcp.rs

@@ -954,7 +954,6 @@ mod tests {
             assert!(kind == ErrorKind::WouldBlock || kind == ErrorKind::TimedOut);
         });
         assert!(wait > Duration::from_millis(400));
-        assert!(wait < Duration::from_millis(1600));
     }
 
     #[test]
@@ -977,6 +976,5 @@ mod tests {
             assert!(kind == ErrorKind::WouldBlock || kind == ErrorKind::TimedOut);
         });
         assert!(wait > Duration::from_millis(400));
-        assert!(wait < Duration::from_millis(1600));
     }
 }

branches/beta/src/libstd/net/udp.rs

@@ -379,7 +379,6 @@ mod tests {
             assert!(kind == ErrorKind::WouldBlock || kind == ErrorKind::TimedOut);
         });
         assert!(wait > Duration::from_millis(400));
-        assert!(wait < Duration::from_millis(1600));
     }
 
     #[test]
@@ -400,6 +399,5 @@ mod tests {
             assert!(kind == ErrorKind::WouldBlock || kind == ErrorKind::TimedOut);
         });
         assert!(wait > Duration::from_millis(400));
-        assert!(wait < Duration::from_millis(1600));
     }
 }