---

yaml
---
r: 80701
b: refs/heads/try
c: a018a5c
h: refs/heads/master
i:
  80699: ffc5e5b
v: v3

Author: alexcrichton

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 4c6bf4872012c010f84dc7fa2cdfe87522533f89
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cbd1eefbd350797b783df119fed7956d7e1c74ad
-refs/heads/try: 68a9137eacb7ea1e61f80279eff03bf758e16e71
+refs/heads/try: a018a5c3433e20a56f642082586f4e4d28469381
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libextra/fileinput.rs

@@ -417,23 +417,20 @@ mod test {
 
     use super::{FileInput, make_path_option_vec, input_vec, input_vec_state};
 
-    use std::rt::io;
-    use std::rt::io::Writer;
-    use std::rt::io::file;
+    use std::io;
     use std::uint;
     use std::vec;
 
     fn make_file(path : &Path, contents: &[~str]) {
-        let mut file = file::open(path, io::CreateOrTruncate, io::Write).unwrap();
+        let file = io::file_writer(path, [io::Create, io::Truncate]).unwrap();
 
         for str in contents.iter() {
-            file.write(str.as_bytes());
-            file.write(['\n' as u8]);
+            file.write_str(*str);
+            file.write_char('\n');
         }
     }
 
     #[test]
-    #[ignore(cfg(windows))] // FIXME(#8810): rt::io::file and windows don't agree
     fn test_make_path_option_vec() {
         let strs = [~"some/path",
                     ~"some/other/path"];
@@ -448,7 +445,6 @@ mod test {
     }
 
     #[test]
-    #[ignore(cfg(windows))] // FIXME(#8810): rt::io::file and windows don't agree
     fn test_fileinput_read_byte() {
         let filenames = make_path_option_vec(vec::from_fn(
             3,
@@ -479,7 +475,6 @@ mod test {
     }
 
     #[test]
-    #[ignore(cfg(windows))] // FIXME(#8810): rt::io::file and windows don't agree
     fn test_fileinput_read() {
         let filenames = make_path_option_vec(vec::from_fn(
             3,
@@ -500,7 +495,6 @@ mod test {
     }
 
     #[test]
-    #[ignore(cfg(windows))] // FIXME(#8810): rt::io::file and windows don't agree
     fn test_input_vec() {
         let mut all_lines = ~[];
         let filenames = make_path_option_vec(vec::from_fn(
@@ -524,7 +518,6 @@ mod test {
     }
 
     #[test]
-    #[ignore(cfg(windows))] // FIXME(#8810): rt::io::file and windows don't agree
     fn test_input_vec_state() {
         let filenames = make_path_option_vec(vec::from_fn(
             3,
@@ -547,7 +540,6 @@ mod test {
     }
 
     #[test]
-    #[ignore(cfg(windows))] // FIXME(#8810): rt::io::file and windows don't agree
     fn test_empty_files() {
         let filenames = make_path_option_vec(vec::from_fn(
             3,
@@ -572,21 +564,18 @@ mod test {
     }
 
     #[test]
-    #[ignore(cfg(windows))] // FIXME(#8810): rt::io::file and windows don't agree
     fn test_no_trailing_newline() {
         let f1 =
             Some(Path("tmp/lib-fileinput-test-no-trailing-newline-1.tmp"));
         let f2 =
             Some(Path("tmp/lib-fileinput-test-no-trailing-newline-2.tmp"));
 
-        {
-            let mut wr = file::open(f1.get_ref(), io::CreateOrTruncate,
-                                    io::Write).unwrap();
-            wr.write("1\n2".as_bytes());
-            let mut wr = file::open(f2.get_ref(), io::CreateOrTruncate,
-                                    io::Write).unwrap();
-            wr.write("3\n4".as_bytes());
-        }
+        let wr = io::file_writer(f1.get_ref(),
+                                 [io::Create, io::Truncate]).unwrap();
+        wr.write_str("1\n2");
+        let wr = io::file_writer(f2.get_ref(),
+                                 [io::Create, io::Truncate]).unwrap();
+        wr.write_str("3\n4");
 
         let mut lines = ~[];
         do input_vec(~[f1, f2]) |line| {
@@ -598,7 +587,6 @@ mod test {
 
 
     #[test]
-    #[ignore(cfg(windows))] // FIXME(#8810): rt::io::file and windows don't agree
     fn test_next_file() {
         let filenames = make_path_option_vec(vec::from_fn(
             3,
@@ -630,7 +618,6 @@ mod test {
 
     #[test]
     #[should_fail]
-    #[ignore(cfg(windows))] // FIXME(#8810): rt::io::file and windows don't agree
     fn test_input_vec_missing_file() {
         do input_vec(make_path_option_vec([~"this/file/doesnt/exist"], true)) |line| {
             println(line);

branches/try/src/libstd/fmt/parse.rs

@@ -554,7 +554,7 @@ impl<'self> Parser<'self> {
     /// characters.
     fn word(&mut self) -> &'self str {
         let start = match self.cur.clone().next() {
-            Some((pos, c)) if char::is_alphabetic(c) => {
+            Some((pos, c)) if char::is_XID_start(c) => {
                 self.cur.next();
                 pos
             }
@@ -563,7 +563,7 @@ impl<'self> Parser<'self> {
         let mut end;
         loop {
             match self.cur.clone().next() {
-                Some((_, c)) if char::is_alphanumeric(c) => {
+                Some((_, c)) if char::is_XID_continue(c) => {
                     self.cur.next();
                 }
                 Some((pos, _)) => { end = pos; break }

branches/try/src/libstd/rt/io/net/tcp.rs

@@ -93,7 +93,7 @@ impl Writer for TcpStream {
         }
     }
 
-    fn flush(&mut self) { fail!() }
+    fn flush(&mut self) { /* no-op */ }
 }
 
 pub struct TcpListener(~RtioTcpListenerObject);

branches/try/src/test/run-pass/ifmt.rs

@@ -82,6 +82,7 @@ pub fn main() {
     t!(format!("{foo} {1} {bar} {0}", 0, 1, foo=2, bar=3), "2 1 3 0");
     t!(format!("{} {0:s}", "a"), "a a");
     t!(format!("{} {0}", "a"), "a a");
+    t!(format!("{foo_bar}", foo_bar=1), "1");
 
     // Methods should probably work
     t!(format!("{0, plural, =1{a#} =2{b#} zero{c#} other{d#}}", 0u), "c0");