---

yaml
---
r: 189343
b: refs/heads/master
c: ead9ab8
h: refs/heads/master
i:
  189341: 7e37b76
  189339: 7934e28
  189335: 5a6991f
  189327: a5dc74f
  189311: a1e398a
v: v3

Author: bors

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 52124d7c807404a551c499a43736722ade9d9890
+refs/heads/master: ead9ab84b80ba3b172d529b1d2a2917bb05b4820
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 270a677d4d698916f5ad103f0afc3c070b8dbeb4
 refs/heads/try: 649d35e4d830b27806705dc5352c86ab6d6fd1a1

trunk/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.
     *)

trunk/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);
             }
         )
     }

trunk/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,
+            };
         }
     }
 }

trunk/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