Fix build for latest Rust

src/cp/cp.rs

@@ -122,13 +122,13 @@ fn copy(matches: getopts::Matches) {
             panic!();
         }
     } else {
-        if fs::stat(&dest).unwrap().kind != io::TypeDirectory {
+        if fs::stat(&dest).unwrap().kind != io::FileType::Directory {
             error!("error: TARGET must be a directory");
             panic!();
         }
 
         for source in sources.iter() {
-            if fs::stat(source).unwrap().kind != io::TypeFile {
+            if fs::stat(source).unwrap().kind != io::FileType::RegularFile {
                 error!("error: \"{}\" is not a file", source.display().to_string());
                 continue;
             }
@@ -165,12 +165,12 @@ pub fn paths_refer_to_same_file(p1: &Path, p2: &Path) -> io::IoResult<bool> {
     };
 
     // We have to take symlinks and relative paths into account.
-    if p1_lstat.kind == io::TypeSymlink {
+    if p1_lstat.kind == io::FileType::Symlink {
         raw_p1 = fs::readlink(&raw_p1).unwrap();
     }
     raw_p1 = os::make_absolute(&raw_p1).unwrap();
 
-    if p2_lstat.kind == io::TypeSymlink {
+    if p2_lstat.kind == io::FileType::Symlink {
         raw_p2 = fs::readlink(&raw_p2).unwrap();
     }
     raw_p2 = os::make_absolute(&raw_p2).unwrap();

src/du/du.rs

@@ -16,7 +16,7 @@ extern crate getopts;
 extern crate libc;
 extern crate time;
 
-use std::io::{stderr, fs, FileStat, TypeDirectory};
+use std::io::{stderr, fs, FileStat, FileType};
 use std::num::Float;
 use std::option::Option;
 use std::path::Path;
@@ -48,7 +48,7 @@ fn du(path: &Path, mut my_stat: Stat,
     let mut stats = vec!();
     let mut futures = vec!();
 
-    if my_stat.fstat.kind == TypeDirectory {
+    if my_stat.fstat.kind == FileType::Directory {
         let read = match fs::readdir(path) {
             Ok(read) => read,
             Err(e) => {
@@ -60,7 +60,7 @@ fn du(path: &Path, mut my_stat: Stat,
 
         for f in read.into_iter() {
             let this_stat = Stat{path: f.clone(), fstat: safe_unwrap!(fs::lstat(&f))};
-            if this_stat.fstat.kind == TypeDirectory {
+            if this_stat.fstat.kind == FileType::Directory {
                 let oa_clone = options.clone();
                 futures.push(Future::spawn(proc() { du(&f, this_stat, oa_clone, depth + 1) }))
             } else {

src/realpath/realpath.rs

@@ -89,7 +89,7 @@ fn resolve_path(path: &str, strip: bool, zero: bool, quiet: bool) -> bool {
             }
             match std::io::fs::lstat(&result) {
                 Err(_) => break,
-                Ok(ref s) if s.kind != std::io::TypeSymlink => break,
+                Ok(ref s) if s.kind != std::io::FileType::Symlink => break,
                 Ok(_) => {
                     links_left -= 1;
                     match std::io::fs::readlink(&result) {

src/tee/tee.rs

@@ -1,5 +1,4 @@
 #![crate_name = "tee"]
-#![license="MIT"]
 #![feature(phase)]
 #![feature(macro_rules)]
 

src/unlink/unlink.rs

@@ -64,8 +64,8 @@ pub fn uumain(args: Vec<String>) -> int {
 
     let result = path.lstat().and_then(|info| {
         match info.kind {
-            io::TypeFile => Ok(()),
-            io::TypeSymlink => Ok(()),
+            io::FileType::RegularFile => Ok(()),
+            io::FileType::Symlink => Ok(()),
             _ => Err(io::IoError {
                 kind: io::OtherIoError,
                 desc: "is not a file or symlink",