auto merge of #16693 : vadimcn/rust/rename--win32, r=pcwalton
This commit is contained in:
commit
6843d8ccd5
|
@ -17,7 +17,6 @@ use header;
|
|||
use procsrv;
|
||||
use util::logv;
|
||||
#[cfg(target_os = "windows")]
|
||||
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
|
||||
use util;
|
||||
|
||||
use std::io::File;
|
||||
|
@ -819,7 +818,6 @@ fn check_expected_errors(expected_errors: Vec<errors::ExpectedError> ,
|
|||
}).collect::<Vec<String> >();
|
||||
|
||||
#[cfg(target_os = "windows")]
|
||||
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
|
||||
fn to_lower( s : &str ) -> String {
|
||||
let i = s.chars();
|
||||
let c : Vec<char> = i.map( |c| {
|
||||
|
@ -833,7 +831,6 @@ fn check_expected_errors(expected_errors: Vec<errors::ExpectedError> ,
|
|||
}
|
||||
|
||||
#[cfg(target_os = "windows")]
|
||||
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
|
||||
fn prefix_matches( line : &str, prefix : &str ) -> bool {
|
||||
to_lower(line).as_slice().starts_with(to_lower(prefix).as_slice())
|
||||
}
|
||||
|
@ -1251,7 +1248,6 @@ fn make_cmdline(_libpath: &str, prog: &str, args: &[String]) -> String {
|
|||
}
|
||||
|
||||
#[cfg(target_os = "windows")]
|
||||
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
|
||||
fn make_cmdline(libpath: &str, prog: &str, args: &[String]) -> String {
|
||||
format!("{} {} {}", lib_path_cmd_prefix(libpath), prog, args.connect(" "))
|
||||
}
|
||||
|
@ -1259,7 +1255,6 @@ fn make_cmdline(libpath: &str, prog: &str, args: &[String]) -> String {
|
|||
// Build the LD_LIBRARY_PATH variable as it would be seen on the command line
|
||||
// for diagnostic purposes
|
||||
#[cfg(target_os = "windows")]
|
||||
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
|
||||
fn lib_path_cmd_prefix(path: &str) -> String {
|
||||
format!("{}=\"{}\"", util::lib_path_env_var(), util::make_new_path(path))
|
||||
}
|
||||
|
|
|
@ -11,7 +11,6 @@
|
|||
use common::Config;
|
||||
|
||||
#[cfg(target_os = "windows")]
|
||||
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
|
||||
use std::os::getenv;
|
||||
|
||||
/// Conversion table from triple OS name to Rust SYSNAME
|
||||
|
@ -36,7 +35,6 @@ pub fn get_os(triple: &str) -> &'static str {
|
|||
}
|
||||
|
||||
#[cfg(target_os = "windows")]
|
||||
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
|
||||
pub fn make_new_path(path: &str) -> String {
|
||||
|
||||
// Windows just uses PATH as the library search path, so we have to
|
||||
|
@ -50,11 +48,9 @@ pub fn make_new_path(path: &str) -> String {
|
|||
}
|
||||
|
||||
#[cfg(target_os = "windows")]
|
||||
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
|
||||
pub fn lib_path_env_var() -> &'static str { "PATH" }
|
||||
|
||||
#[cfg(target_os = "windows")]
|
||||
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
|
||||
pub fn path_div() -> &'static str { ";" }
|
||||
|
||||
pub fn logv(config: &Config, s: String) {
|
||||
|
|
|
@ -68,8 +68,6 @@ for llconfig in sys.argv[4:]:
|
|||
]
|
||||
|
||||
f.write("#[cfg(" + ', '.join(cfg) + ")]\n")
|
||||
if os == "windows": # NOTE: Remove after snapshot
|
||||
f.write("#[cfg(stage0, target_arch = \"%s\", target_os = \"win32\")]\n" % (arch,))
|
||||
|
||||
version = run([llconfig, '--version']).strip()
|
||||
|
||||
|
|
|
@ -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,7 +1195,6 @@ 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 {
|
||||
|
@ -1203,7 +1202,7 @@ pub mod types {
|
|||
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,
|
||||
|
@ -1915,7 +1914,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};
|
||||
|
@ -4000,7 +3998,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};
|
||||
|
@ -4430,7 +4427,6 @@ pub mod funcs {
|
|||
}
|
||||
|
||||
#[cfg(target_os = "windows")]
|
||||
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
|
||||
pub mod posix01 {
|
||||
pub mod stat_ {
|
||||
}
|
||||
|
@ -4447,7 +4443,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")]
|
||||
|
@ -4586,7 +4581,6 @@ pub mod funcs {
|
|||
|
||||
|
||||
#[cfg(target_os = "windows")]
|
||||
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
|
||||
pub mod bsd44 {
|
||||
}
|
||||
|
||||
|
@ -4613,7 +4607,6 @@ pub mod funcs {
|
|||
|
||||
|
||||
#[cfg(target_os = "windows")]
|
||||
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
|
||||
pub mod extra {
|
||||
|
||||
pub mod kernel32 {
|
||||
|
|
|
@ -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};
|
|
@ -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;
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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
|
|
@ -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",
|
||||
|
|
|
@ -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.
|
||||
*
|
||||
|
|
|
@ -74,7 +74,6 @@ impl PluginManager {
|
|||
}
|
||||
|
||||
#[cfg(target_os = "windows")]
|
||||
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
|
||||
fn libname(mut n: String) -> String {
|
||||
n.push_str(".dll");
|
||||
n
|
||||
|
@ -86,8 +85,7 @@ fn libname(mut n: String) -> String {
|
|||
n
|
||||
}
|
||||
|
||||
#[cfg(not(stage0), not(target_os="windows"), not(target_os="macos"))]
|
||||
#[cfg(stage0, not(target_os="win32"), not(target_os="macos"))] // NOTE: Remove after snapshot
|
||||
#[cfg(not(target_os="windows"), not(target_os="macos"))]
|
||||
fn libname(n: String) -> String {
|
||||
let mut i = String::from_str("lib");
|
||||
i.push_str(n.as_slice());
|
||||
|
|
|
@ -148,7 +148,6 @@ mod imp {
|
|||
#[cfg(target_os = "macos")]
|
||||
#[cfg(target_os = "ios")]
|
||||
#[cfg(target_os = "windows")]
|
||||
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
|
||||
mod imp {
|
||||
use core::prelude::*;
|
||||
use collections::vec::Vec;
|
||||
|
|
|
@ -88,7 +88,6 @@ pub type _Unwind_Exception_Cleanup_Fn =
|
|||
#[cfg(target_os = "linux")]
|
||||
#[cfg(target_os = "freebsd")]
|
||||
#[cfg(target_os = "windows")]
|
||||
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
|
||||
#[link(name = "gcc_s")]
|
||||
extern {}
|
||||
|
||||
|
|
|
@ -200,7 +200,6 @@ pub unsafe fn record_sp_limit(limit: uint) {
|
|||
asm!("movq $0, %fs:112" :: "r"(limit) :: "volatile")
|
||||
}
|
||||
#[cfg(target_arch = "x86_64", target_os = "windows")] #[inline(always)]
|
||||
#[cfg(stage0, target_arch = "x86_64", target_os = "win32")] // NOTE: Remove after snapshot
|
||||
unsafe fn target_record_sp_limit(limit: uint) {
|
||||
// see: http://en.wikipedia.org/wiki/Win32_Thread_Information_Block
|
||||
// store this inside of the "arbitrary data slot", but double the size
|
||||
|
@ -229,7 +228,6 @@ pub unsafe fn record_sp_limit(limit: uint) {
|
|||
asm!("movl $0, %gs:48" :: "r"(limit) :: "volatile")
|
||||
}
|
||||
#[cfg(target_arch = "x86", target_os = "windows")] #[inline(always)]
|
||||
#[cfg(stage0, target_arch = "x86", target_os = "win32")] // NOTE: Remove after snapshot
|
||||
unsafe fn target_record_sp_limit(limit: uint) {
|
||||
// see: http://en.wikipedia.org/wiki/Win32_Thread_Information_Block
|
||||
// store this inside of the "arbitrary data slot"
|
||||
|
@ -283,7 +281,6 @@ pub unsafe fn get_sp_limit() -> uint {
|
|||
return limit;
|
||||
}
|
||||
#[cfg(target_arch = "x86_64", target_os = "windows")] #[inline(always)]
|
||||
#[cfg(stage0, target_arch = "x86_64", target_os = "win32")] // NOTE: Remove after snapshot
|
||||
unsafe fn target_get_sp_limit() -> uint {
|
||||
let limit;
|
||||
asm!("movq %gs:0x28, $0" : "=r"(limit) ::: "volatile");
|
||||
|
@ -320,7 +317,6 @@ pub unsafe fn get_sp_limit() -> uint {
|
|||
return limit;
|
||||
}
|
||||
#[cfg(target_arch = "x86", target_os = "windows")] #[inline(always)]
|
||||
#[cfg(stage0, target_arch = "x86", target_os = "win32")] // NOTE: Remove after snapshot
|
||||
unsafe fn target_get_sp_limit() -> uint {
|
||||
let limit;
|
||||
asm!("movl %fs:0x14, $0" : "=r"(limit) ::: "volatile");
|
||||
|
|
|
@ -733,7 +733,6 @@ extern {}
|
|||
extern {}
|
||||
|
||||
#[cfg(target_os = "windows")]
|
||||
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
|
||||
#[link(name = "ws2_32")]
|
||||
#[link(name = "psapi")]
|
||||
#[link(name = "iphlpapi")]
|
||||
|
|
|
@ -279,7 +279,6 @@ pub mod dl {
|
|||
}
|
||||
|
||||
#[cfg(target_os = "windows")]
|
||||
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
|
||||
pub mod dl {
|
||||
use c_str::ToCStr;
|
||||
use iter::Iterator;
|
||||
|
|
|
@ -348,7 +348,7 @@ impl IoError {
|
|||
// libuv maps this error code to EISDIR. we do too. if it is found
|
||||
// to be incorrect, we can add in some more machinery to only
|
||||
// return this message when ERROR_INVALID_FUNCTION after certain
|
||||
// win32 calls.
|
||||
// Windows calls.
|
||||
libc::ERROR_INVALID_FUNCTION => (InvalidInput,
|
||||
"illegal operation on a directory"),
|
||||
|
||||
|
|
|
@ -139,7 +139,7 @@ pub fn getcwd() -> Path {
|
|||
}
|
||||
|
||||
#[cfg(windows)]
|
||||
pub mod win32 {
|
||||
pub mod windows {
|
||||
use libc::types::os::arch::extra::DWORD;
|
||||
use libc;
|
||||
use option::{None, Option};
|
||||
|
@ -362,7 +362,7 @@ pub fn getenv_as_bytes(n: &str) -> Option<Vec<u8>> {
|
|||
pub fn getenv(n: &str) -> Option<String> {
|
||||
unsafe {
|
||||
with_env_lock(|| {
|
||||
use os::win32::{fill_utf16_buf_and_decode};
|
||||
use os::windows::{fill_utf16_buf_and_decode};
|
||||
let n: Vec<u16> = n.utf16_units().collect();
|
||||
let n = n.append_one(0);
|
||||
fill_utf16_buf_and_decode(|buf, sz| {
|
||||
|
@ -707,7 +707,7 @@ pub fn self_exe_name() -> Option<Path> {
|
|||
#[cfg(windows)]
|
||||
fn load_self() -> Option<Vec<u8>> {
|
||||
unsafe {
|
||||
use os::win32::fill_utf16_buf_and_decode;
|
||||
use os::windows::fill_utf16_buf_and_decode;
|
||||
fill_utf16_buf_and_decode(|buf, sz| {
|
||||
libc::GetModuleFileNameW(0u as libc::DWORD, buf, sz)
|
||||
}).map(|s| s.into_string().into_bytes())
|
||||
|
@ -1315,7 +1315,7 @@ pub fn page_size() -> uint {
|
|||
|
||||
/// A memory mapped file or chunk of memory. This is a very system-specific
|
||||
/// interface to the OS's memory mapping facilities (`mmap` on POSIX,
|
||||
/// `VirtualAlloc`/`CreateFileMapping` on win32). It makes no attempt at
|
||||
/// `VirtualAlloc`/`CreateFileMapping` on Windows). It makes no attempt at
|
||||
/// abstracting platform differences, besides in error values returned. Consider
|
||||
/// yourself warned.
|
||||
///
|
||||
|
@ -1385,7 +1385,7 @@ pub enum MapError {
|
|||
ErrZeroLength,
|
||||
/// Unrecognized error. The inner value is the unrecognized errno.
|
||||
ErrUnknown(int),
|
||||
/// ## The following are win32-specific
|
||||
/// ## The following are Windows-specific
|
||||
///
|
||||
/// Unsupported combination of protection flags
|
||||
/// (`MapReadable`/`MapWritable`/`MapExecutable`).
|
||||
|
@ -1843,14 +1843,13 @@ pub mod consts {
|
|||
}
|
||||
|
||||
#[cfg(target_os = "windows")]
|
||||
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
|
||||
pub mod consts {
|
||||
pub use os::arch_consts::ARCH;
|
||||
|
||||
pub static FAMILY: &'static str = "windows";
|
||||
|
||||
/// A string describing the specific operating system in use: in this
|
||||
/// case, `win32`.
|
||||
/// case, `windows`.
|
||||
pub static SYSNAME: &'static str = "windows";
|
||||
|
||||
/// Specifies the filename prefix used for shared libraries on this
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
//! Windows console handling
|
||||
|
||||
// FIXME (#13400): this is only a tiny fraction of the win32 console api
|
||||
// FIXME (#13400): this is only a tiny fraction of the Windows console api
|
||||
|
||||
extern crate libc;
|
||||
|
||||
|
|
|
@ -18,7 +18,6 @@ mod hello;
|
|||
mod hello;
|
||||
|
||||
#[cfg(target_os = "windows")]
|
||||
/* NOTE: Remove after snapshot */#[cfg(stage0, target_os = "win32")]
|
||||
mod hello;
|
||||
|
||||
#[cfg(target_os = "freebsd")]
|
||||
|
|
|
@ -43,7 +43,6 @@ mod m {
|
|||
}
|
||||
|
||||
#[cfg(target_os = "windows")]
|
||||
/* NOTE: Remove after snapshot */#[cfg(stage0, target_os = "win32")]
|
||||
mod m {
|
||||
#[main]
|
||||
#[cfg(target_arch = "x86")]
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
// aux-build:linkage-visibility.rs
|
||||
// ignore-android: FIXME(#10379)
|
||||
// ignore-windows: std::dynamic_lib does not work on win32 well
|
||||
// ignore-windows: std::dynamic_lib does not work on Windows well
|
||||
|
||||
extern crate foo = "linkage-visibility";
|
||||
|
||||
|
|
|
@ -56,7 +56,6 @@ mod m {
|
|||
}
|
||||
|
||||
#[cfg(target_os = "windows")]
|
||||
/* NOTE: Remove after snapshot */#[cfg(stage0, target_os = "win32")]
|
||||
mod m {
|
||||
#[cfg(target_arch = "x86")]
|
||||
pub mod m {
|
||||
|
|
Loading…
Reference in New Issue