1 files changed, 19 insertions, 22 deletions

diff --git a/src/libstd/io.rs b/src/libstd/io.rs
index 859cf20fa41..dfe517932fc 100644
--- a/src/libstd/io.rs
+++ b/src/libstd/io.rs
@@ -947,9 +947,8 @@ impl Reader for *libc::FILE {
                   match libc::ferror(*self) {
                     0 => (),
                     _ => {
-                      error!("error reading buffer");
-                      error!("%s", os::last_os_error());
-                      fail!();
+                      error2!("error reading buffer: {}", os::last_os_error());
+                      fail2!();
                     }
                   }
                 }
@@ -1194,9 +1193,8 @@ impl Writer for *libc::FILE {
                                         len as size_t,
                                         *self);
                 if nout != len as size_t {
-                    error!("error writing buffer");
-                    error!("%s", os::last_os_error());
-                    fail!();
+                    error2!("error writing buffer: {}", os::last_os_error());
+                    fail2!();
                 }
             }
         }
@@ -1264,9 +1262,8 @@ impl Writer for fd_t {
                     let vb = ptr::offset(vbuf, count as int) as *c_void;
                     let nout = libc::write(*self, vb, len as IoSize);
                     if nout < 0 as IoRet {
-                        error!("error writing buffer");
-                        error!("%s", os::last_os_error());
-                        fail!();
+                        error2!("error writing buffer: {}", os::last_os_error());
+                        fail2!();
                     }
                     count += nout as uint;
                 }
@@ -1274,12 +1271,12 @@ impl Writer for fd_t {
         }
     }
     fn seek(&self, _offset: int, _whence: SeekStyle) {
-        error!("need 64-bit foreign calls for seek, sorry");
-        fail!();
+        error2!("need 64-bit foreign calls for seek, sorry");
+        fail2!();
     }
     fn tell(&self) -> uint {
-        error!("need 64-bit foreign calls for tell, sorry");
-        fail!();
+        error2!("need 64-bit foreign calls for tell, sorry");
+        fail2!();
     }
     fn flush(&self) -> int { 0 }
     fn get_type(&self) -> WriterType {
@@ -1347,7 +1344,7 @@ pub fn mk_file_writer(path: &Path, flags: &[FileFlag])
         }
     };
     if fd < (0 as c_int) {
-        Err(fmt!("error opening %s: %s", path.to_str(), os::last_os_error()))
+        Err(format!("error opening {}: {}", path.to_str(), os::last_os_error()))
     } else {
         Ok(fd_writer(fd, true))
     }
@@ -1924,17 +1921,17 @@ mod tests {
     #[test]
     fn test_simple() {
         let tmpfile = &Path("tmp/lib-io-test-simple.tmp");
-        debug!(tmpfile);
+        debug2!("{:?}", tmpfile);
         let frood: ~str =
             ~"A hoopy frood who really knows where his towel is.";
-        debug!(frood.clone());
+        debug2!("{}", frood.clone());
         {
             let out = io::file_writer(tmpfile, [io::Create, io::Truncate]).unwrap();
             out.write_str(frood);
         }
         let inp = io::file_reader(tmpfile).unwrap();
         let frood2: ~str = inp.read_c_str();
-        debug!(frood2.clone());
+        debug2!("{}", frood2.clone());
         assert_eq!(frood, frood2);
     }
 
@@ -1951,14 +1948,14 @@ mod tests {
         {
             let file = io::file_reader(&path).unwrap();
             do file.each_byte() |_| {
-                fail!("must be empty")
+                fail2!("must be empty")
             };
         }
 
         {
             let file = io::file_reader(&path).unwrap();
             do file.each_char() |_| {
-                fail!("must be empty")
+                fail2!("must be empty")
             };
         }
     }
@@ -2045,7 +2042,7 @@ mod tests {
           Err(e) => {
             assert_eq!(e, ~"error opening not a file");
           }
-          Ok(_) => fail!()
+          Ok(_) => fail2!()
         }
     }
 
@@ -2085,7 +2082,7 @@ mod tests {
           Err(e) => {
             assert!(e.starts_with("error opening"));
           }
-          Ok(_) => fail!()
+          Ok(_) => fail2!()
         }
     }
 
@@ -2095,7 +2092,7 @@ mod tests {
           Err(e) => {
             assert!(e.starts_with("error opening"));
           }
-          Ok(_) => fail!()
+          Ok(_) => fail2!()
         }
     }