Complete renaming of win32 to windows

7 files changed, 9 insertions, 10 deletions

diff --git a/src/libnative/io/c_win32.rs b/src/libnative/io/c_windows.rs
index 80c9e91b48f..80c9e91b48f 100644
--- a/src/libnative/io/c_win32.rs
+++ b/src/libnative/io/c_windows.rs
diff --git a/src/libnative/io/file_win32.rs b/src/libnative/io/file_windows.rs
index fe29c024529..cb1d79b8397 100644
--- a/src/libnative/io/file_win32.rs
+++ b/src/libnative/io/file_windows.rs
@@ -8,14 +8,14 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-//! Blocking win32-based file I/O
+//! Blocking Windows-based file I/O
 
 use alloc::arc::Arc;
 use libc::{c_int, c_void};
 use libc;
 use std::c_str::CString;
 use std::mem;
-use std::os::win32::fill_utf16_buf_and_decode;
+use std::os::windows::fill_utf16_buf_and_decode;
 use std::ptr;
 use std::rt::rtio;
 use std::rt::rtio::{IoResult, IoError};
diff --git a/src/libnative/io/mod.rs b/src/libnative/io/mod.rs
index 5d661007329..2dc6539b178 100644
--- a/src/libnative/io/mod.rs
+++ b/src/libnative/io/mod.rs
@@ -46,7 +46,7 @@ mod util;
 #[path = "file_unix.rs"]
 pub mod file;
 #[cfg(windows)]
-#[path = "file_win32.rs"]
+#[path = "file_windows.rs"]
 pub mod file;
 
 #[cfg(target_os = "macos")]
@@ -59,8 +59,7 @@ pub mod file;
 pub mod timer;
 
 #[cfg(target_os = "windows")]
-#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
-#[path = "timer_win32.rs"]
+#[path = "timer_windows.rs"]
 pub mod timer;
 
 #[cfg(unix)]
@@ -68,15 +67,15 @@ pub mod timer;
 pub mod pipe;
 
 #[cfg(windows)]
-#[path = "pipe_win32.rs"]
+#[path = "pipe_windows.rs"]
 pub mod pipe;
 
 #[cfg(windows)]
-#[path = "tty_win32.rs"]
+#[path = "tty_windows.rs"]
 mod tty;
 
 #[cfg(unix)]    #[path = "c_unix.rs"]  mod c;
-#[cfg(windows)] #[path = "c_win32.rs"] mod c;
+#[cfg(windows)] #[path = "c_windows.rs"] mod c;
 
 fn unimpl() -> IoError {
     #[cfg(unix)] use libc::ENOSYS as ERROR;
diff --git a/src/libnative/io/pipe_win32.rs b/src/libnative/io/pipe_windows.rs
index 717915e5d23..717915e5d23 100644
--- a/src/libnative/io/pipe_win32.rs
+++ b/src/libnative/io/pipe_windows.rs
diff --git a/src/libnative/io/process.rs b/src/libnative/io/process.rs
index 443d7645388..d1b28854157 100644
--- a/src/libnative/io/process.rs
+++ b/src/libnative/io/process.rs
@@ -786,7 +786,7 @@ fn with_envp<T>(env: Option<&[(&CString, &CString)]>,
 
 #[cfg(windows)]
 fn with_envp<T>(env: Option<&[(&CString, &CString)]>, cb: |*mut c_void| -> T) -> T {
-    // On win32 we pass an "environment block" which is not a char**, but
+    // On Windows we pass an "environment block" which is not a char**, but
     // rather a concatenation of null-terminated k=v\0 sequences, with a final
     // \0 to terminate.
     match env {
diff --git a/src/libnative/io/timer_win32.rs b/src/libnative/io/timer_windows.rs
index 1e5594126b1..8d781f50d35 100644
--- a/src/libnative/io/timer_win32.rs
+++ b/src/libnative/io/timer_windows.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-//! Timers based on win32 WaitableTimers
+//! Timers based on Windows WaitableTimers
 //!
 //! This implementation is meant to be used solely on windows. As with other
 //! implementations, there is a worker thread which is doing all the waiting on
diff --git a/src/libnative/io/tty_win32.rs b/src/libnative/io/tty_windows.rs
index e98fe1e20b1..e98fe1e20b1 100644
--- a/src/libnative/io/tty_win32.rs
+++ b/src/libnative/io/tty_windows.rs