---

yaml
---
r: 189852
b: refs/heads/tmp
c: 8ac528b
h: refs/heads/master
v: v3

Author: richo

[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: 43984618eb5c56d69ef1659fd506e26a0fd2d9bb
+refs/heads/tmp: 8ac528bed1cc30eabe26a5acc345acd9cbcf7198
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: 7ce5a21b274ff53e77b561467177bc34c668f95e

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

branches/tmp/src/doc/trpl/plugins.md

@@ -63,7 +63,7 @@ that implements Roman numeral integer literals.
 
 ```ignore
 #![crate_type="dylib"]
-#![feature(plugin_registrar, rustc_private)]
+#![feature(plugin_registrar)]
 
 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[rn.len()..];
+                text = text.slice_from(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_u32(sp, total))
+    MacEager::expr(cx.expr_usize(sp, total))
 }
 
 #[plugin_registrar]

branches/tmp/src/librustc_driver/driver.rs

@@ -954,8 +954,11 @@ pub fn build_output_filenames(input: &Input,
             if *odir != None {
                 sess.warn("ignoring --out-dir flag due to -o flag.");
             }
+
+            let cur_dir = Path::new("");
+
             OutputFilenames {
-                out_directory: out_file.parent().unwrap().to_path_buf(),
+                out_directory: out_file.parent().unwrap_or(cur_dir).to_path_buf(),
                 out_filestem: out_file.file_stem().unwrap()
                                       .to_str().unwrap().to_string(),
                 single_output_file: ofile,

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

branches/tmp/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;
         }
     }
 }

branches/tmp/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

branches/tmp/src/test/run-pass/issue-4759-1.rs

@@ -7,7 +7,9 @@
 // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
+//
+// ignore-lexer-test FIXME #15877
 
 trait U { fn f(self); }
-impl U for isize { fn f(self) {} }
+impl U for int { fn f(self) {} }
 pub fn main() { 4.f(); }

branches/tmp/src/test/run-pass/unsized.rs

@@ -7,6 +7,8 @@
 // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
+//
+// ignore-lexer-test FIXME #15879
 
 // Test syntax checks for `?Sized` syntax.
 

branches/tmp/src/test/run-pass/unsized2.rs

@@ -7,6 +7,8 @@
 // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
+//
+// ignore-lexer-test FIXME #15879
 
 #![allow(unknown_features)]
 #![feature(box_syntax)]