Complete renaming of win32 to windows

Author: vadimcn

src/liblibc/lib.rs

@@ -64,7 +64,7 @@
 * sanity while editing, filling-in-details and eliminating duplication) into
 * definitions common-to-all (held in modules named c95, c99, posix88, posix01
 * and posix08) and definitions that appear only on *some* platforms (named
-* 'extra'). This would be things like significant OSX foundation kit, or win32
+* 'extra'). This would be things like significant OSX foundation kit, or Windows
 * library kernel32.dll, or various fancy glibc, linux or BSD extensions.
 *
 * In addition to the per-platform 'extra' modules, we define a module of
@@ -1195,15 +1195,14 @@ pub mod types {
     }
 
     #[cfg(target_os = "windows")]
-    #[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
     pub mod os {
         pub mod common {
             pub mod posix01 {
                 use types::os::arch::c95::{c_short, time_t, c_long};
                 use types::os::arch::extra::{int64, time64_t};
                 use types::os::arch::posix88::{dev_t, ino_t};
 
-                // pub Note: this is the struct called stat64 in win32. Not stat,
+                // pub Note: this is the struct called stat64 in Windows. Not stat,
                 // nor stati64.
                 #[repr(C)]
                 pub struct stat {
@@ -1220,7 +1219,7 @@ pub mod types {
                     pub st_ctime: time64_t,
                 }
 
-                // note that this is called utimbuf64 in win32
+                // note that this is called utimbuf64 in Windows
                 #[repr(C)]
                 pub struct utimbuf {
                     pub actime: time64_t,
@@ -1907,7 +1906,6 @@ pub mod consts {
     // into this module.
 
     #[cfg(target_os = "windows")]
-    #[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
     pub mod os {
         pub mod c95 {
             use types::os::arch::c95::{c_int, c_uint};
@@ -3992,7 +3990,6 @@ pub mod funcs {
     // with the same POSIX functions and types as other platforms.
 
     #[cfg(target_os = "windows")]
-    #[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
     pub mod posix88 {
         pub mod stat_ {
             use types::os::common::posix01::{stat, utimbuf};
@@ -4422,7 +4419,6 @@ pub mod funcs {
     }
 
     #[cfg(target_os = "windows")]
-    #[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
     pub mod posix01 {
         pub mod stat_ {
         }
@@ -4439,7 +4435,6 @@ pub mod funcs {
 
 
     #[cfg(target_os = "windows")]
-    #[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
     #[cfg(target_os = "linux")]
     #[cfg(target_os = "android")]
     #[cfg(target_os = "macos")]
@@ -4578,7 +4573,6 @@ pub mod funcs {
 
 
     #[cfg(target_os = "windows")]
-    #[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
     pub mod bsd44 {
     }
 
@@ -4605,7 +4599,6 @@ pub mod funcs {
 
 
     #[cfg(target_os = "windows")]
-    #[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
     pub mod extra {
 
         pub mod kernel32 {

src/libnative/io/c_win32.rs renamed to src/libnative/io/c_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};

src/libnative/io/file_win32.rs renamed to src/libnative/io/file_windows.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,24 +59,23 @@ 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)]
 #[path = "pipe_unix.rs"]
 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;

src/libnative/io/mod.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 {

src/libnative/io/pipe_win32.rs renamed to src/libnative/io/pipe_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

src/libnative/io/process.rs

@@ -856,7 +856,7 @@ pub fn get_cc_prog(sess: &Session) -> String {
     // In the future, FreeBSD will use clang as default compiler.
     // It would be flexible to use cc (system's default C compiler)
     // instead of hard-coded gcc.
-    // For win32, there is no cc command, so we add a condition to make it use gcc.
+    // For Windows, there is no cc command, so we add a condition to make it use gcc.
     match sess.targ_cfg.os {
         abi::OsWindows => "gcc",
         _ => "cc",

src/libnative/io/timer_win32.rs renamed to src/libnative/io/timer_windows.rs

@@ -876,7 +876,7 @@ pub fn trans_drop_flag_ptr<'b>(mut bcx: &'b Block<'b>, r: &Repr,
  * depending on which case of an enum it is.
  *
  * To understand the alignment situation, consider `enum E { V64(u64),
- * V32(u32, u32) }` on win32.  The type has 8-byte alignment to
+ * V32(u32, u32) }` on Windows.  The type has 8-byte alignment to
  * accommodate the u64, but `V32(x, y)` would have LLVM type `{i32,
  * i32, i32}`, which is 4-byte aligned.
  *