More import fixes for Windows.

src/mv/Cargo.toml

@@ -14,6 +14,7 @@ uucore = { path="../uucore" }
 
 [dev-dependencies]
 time = "*"
+
 [[bin]]
 name="mv"
 path="mv.rs"

src/sync/Cargo.toml

@@ -10,6 +10,8 @@ path = "sync.rs"
 [dependencies]
 getopts = "*"
 libc = "*"
+winapi = "*"
+kernel32-sys = "*"
 uucore = { path="../uucore" }
 
 [[bin]]

src/uucore/Cargo.toml

@@ -6,6 +6,7 @@ authors = []
 [dependencies]
 libc = "*"
 time = "*"
+winapi = "*"
 
 [lib]
 path = "lib.rs"

src/uucore/fs.rs

@@ -12,7 +12,8 @@
 // be backported to stable (<= 1.1). This will likely be dropped
 // when the path trait stabilizes.
 
-use ::libc;
+#[cfg(unix)]
+use super::libc;
 use std::env;
 use std::fs;
 use std::io::{Error, ErrorKind, Result};

src/uucore/lib.rs

@@ -1,5 +1,6 @@
 extern crate libc;
 extern crate time;
+#[cfg(windows)] extern crate winapi;
 
 #[macro_use]
 mod macros;

src/whoami/Cargo.toml

@@ -10,6 +10,8 @@ path = "whoami.rs"
 [dependencies]
 getopts = "*"
 libc = "*"
+winapi = "*"
+advapi32-sys = "*"
 uucore = { path="../uucore" }
 
 [[bin]]

src/whoami/platform/windows.rs

@@ -11,8 +11,7 @@ extern crate winapi;
 extern crate advapi32;
 extern crate uucore;
 
-use std::ffi::OsString;
-use std::io::{Error, Result, Write};
+use std::io::{Error, Result};
 use std::mem;
 use std::os::windows::ffi::OsStringExt;
 use uucore::wide::FromWide;