---

yaml
---
r: 189341
b: refs/heads/tmp
c: ead9ab8
h: refs/heads/master
i:
  189339: 7934e28
v: v3

Author: bors

[refs]

@@ -34,6 +34,6 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
 refs/heads/beta: 522d09dfecbeca1595f25ac58c6d0178bbd21d7d
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
-refs/heads/tmp: 52124d7c807404a551c499a43736722ade9d9890
+refs/heads/tmp: ead9ab84b80ba3b172d529b1d2a2917bb05b4820
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: 7ce5a21b274ff53e77b561467177bc34c668f95e

branches/tmp/configure

@@ -430,6 +430,10 @@ case $CFG_OSTYPE in
         CFG_CPUTYPE=x86_64
         ;;
 
+#   Win 8 # uname -s on 64-bit cygwin does not contain WOW64, so simply use uname -m to detect arch (works in my install)
+    CYGWIN_NT-6.3)
+    	CFG_OSTYPE=pc-windows-gnu
+    	;;
 # We do not detect other OS such as XP/2003 using 64 bit using uname.
 # If we want to in the future, we will need to use Cygwin - Chuck's csih helper in /usr/lib/csih/winProductName.exe or alternative.
     *)

branches/tmp/src/libstd/num/mod.rs

@@ -1633,7 +1633,7 @@ mod tests {
                 assert_eq!((3 as $T).is_power_of_two(), false);
                 assert_eq!((4 as $T).is_power_of_two(), true);
                 assert_eq!((5 as $T).is_power_of_two(), false);
-                assert!(($T::MAX / 2 + 1).is_power_of_two(), true);
+                assert_eq!(($T::MAX / 2 + 1).is_power_of_two(), true);
             }
         )
     }

branches/tmp/src/libtest/lib.rs

@@ -1109,7 +1109,14 @@ impl Bencher {
                 return summ5;
             }
 
-            n *= 2;
+            // If we overflow here just return the results so far. We check a
+            // multiplier of 10 because we're about to multiply by 2 and the
+            // next iteration of the loop will also multiply by 5 (to calculate
+            // the summ5 result)
+            n = match n.checked_mul(10) {
+                Some(_) => n * 2,
+                None => return summ5,
+            };
         }
     }
 }

branches/tmp/src/test/parse-fail/issue-5806.rs

@@ -10,6 +10,7 @@
 
 // ignore-windows
 // ignore-freebsd
+// ignore-openbsd
 
 #[path = "../compile-fail"]
 mod foo; //~ ERROR: a directory