---

yaml
---
r: 189342
b: refs/heads/master
c: 52124d7
h: refs/heads/master
v: v3

Author: rprichard

[refs]

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

trunk/configure

@@ -430,10 +430,6 @@ 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/doc/trpl/plugins.md

@@ -63,7 +63,7 @@ that implements Roman numeral integer literals.
 
 ```ignore
 #![crate_type="dylib"]
-#![feature(plugin_registrar)]
+#![feature(plugin_registrar, rustc_private)]
 
 extern crate syntax;
 extern crate rustc;
@@ -92,13 +92,13 @@ fn expand_rn(cx: &mut ExtCtxt, sp: Span, args: &[TokenTree])
         }
     };
 
-    let mut text = &text;
+    let mut text = &*text;
     let mut total = 0;
     while !text.is_empty() {
         match NUMERALS.iter().find(|&&(rn, _)| text.starts_with(rn)) {
             Some(&(rn, val)) => {
                 total += val;
-                text = text.slice_from(rn.len());
+                text = &text[rn.len()..];
             }
             None => {
                 cx.span_err(sp, "invalid Roman numeral");
@@ -107,7 +107,7 @@ fn expand_rn(cx: &mut ExtCtxt, sp: Span, args: &[TokenTree])
         }
     }
 
-    MacEager::expr(cx.expr_usize(sp, total))
+    MacEager::expr(cx.expr_u32(sp, total))
 }
 
 #[plugin_registrar]

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_eq!(($T::MAX / 2 + 1).is_power_of_two(), true);
+                assert!(($T::MAX / 2 + 1).is_power_of_two(), true);
             }
         )
     }

trunk/src/libtest/lib.rs

@@ -1109,14 +1109,7 @@ impl Bencher {
                 return summ5;
             }
 
-            // 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,
-            };
+            n *= 2;
         }
     }
 }

trunk/src/test/parse-fail/issue-5806.rs

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