rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

auto merge of #16435 : vadimcn/rust/windows, r=pcwalton

Browse Source 
Using "win32" to mean "Windows" is confusing, especially now, that Rust supports win64 builds.
Let's call spade a spade.
This commit is contained in:
bors
2014-08-15 00:46:19 +00:00
parent dbb0cee682 88c27e099f
commit 6b5ec40d45
55 changed files with 132 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/compiletest/runtest.rs
View File

@@ -16,7 +16,8 @@ use header::TestProps;
use header; use header;
use procsrv; use procsrv;
use util::logv; use util::logv;
#[cfg(target_os = "win32")] #[cfg(target_os = "windows")]
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
use util; use util;
use std::io::File; use std::io::File;
@@ -817,7 +818,8 @@ fn check_expected_errors(expected_errors: Vec<errors::ExpectedError> ,
format!("{}:{}:", testfile.display(), ee.line) format!("{}:{}:", testfile.display(), ee.line)
}).collect::<Vec<String> >(); }).collect::<Vec<String> >();
#[cfg(target_os = "win32")] #[cfg(target_os = "windows")]
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
fn to_lower( s : &str ) -> String { fn to_lower( s : &str ) -> String {
let i = s.chars(); let i = s.chars();
let c : Vec<char> = i.map( |c| { let c : Vec<char> = i.map( |c| {
@@ -830,7 +832,8 @@ fn check_expected_errors(expected_errors: Vec<errors::ExpectedError> ,
String::from_chars(c.as_slice()) String::from_chars(c.as_slice())
} }
#[cfg(target_os = "win32")] #[cfg(target_os = "windows")]
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
fn prefix_matches( line : &str, prefix : &str ) -> bool { fn prefix_matches( line : &str, prefix : &str ) -> bool {
to_lower(line).as_slice().starts_with(to_lower(prefix).as_slice()) to_lower(line).as_slice().starts_with(to_lower(prefix).as_slice())
} }
@@ -1247,14 +1250,16 @@ fn make_cmdline(_libpath: &str, prog: &str, args: &[String]) -> String {
format!("{} {}", prog, args.connect(" ")) format!("{} {}", prog, args.connect(" "))
} }
#[cfg(target_os = "win32")] #[cfg(target_os = "windows")]
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
fn make_cmdline(libpath: &str, prog: &str, args: &[String]) -> String { fn make_cmdline(libpath: &str, prog: &str, args: &[String]) -> String {
format!("{} {} {}", lib_path_cmd_prefix(libpath), prog, args.connect(" ")) format!("{} {} {}", lib_path_cmd_prefix(libpath), prog, args.connect(" "))
} }
// Build the LD_LIBRARY_PATH variable as it would be seen on the command line // Build the LD_LIBRARY_PATH variable as it would be seen on the command line
// for diagnostic purposes // for diagnostic purposes
#[cfg(target_os = "win32")] #[cfg(target_os = "windows")]
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
fn lib_path_cmd_prefix(path: &str) -> String { fn lib_path_cmd_prefix(path: &str) -> String {
format!("{}=\"{}\"", util::lib_path_env_var(), util::make_new_path(path)) format!("{}=\"{}\"", util::lib_path_env_var(), util::make_new_path(path))
} }

17
src/compiletest/util.rs
View File

@@ -10,13 +10,15 @@
use common::Config; use common::Config;
#[cfg(target_os = "win32")] #[cfg(target_os = "windows")]
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
use std::os::getenv; use std::os::getenv;
/// Conversion table from triple OS name to Rust SYSNAME /// Conversion table from triple OS name to Rust SYSNAME
static OS_TABLE: &'static [(&'static str, &'static str)] = &[ static OS_TABLE: &'static [(&'static str, &'static str)] = &[
("mingw32", "win32"), ("mingw32", "windows"),
("win32", "win32"), ("win32", "windows"),
("windows", "windows"),
("darwin", "macos"), ("darwin", "macos"),
("android", "android"), ("android", "android"),
("linux", "linux"), ("linux", "linux"),
@@ -33,7 +35,8 @@ pub fn get_os(triple: &str) -> &'static str {
fail!("Cannot determine OS from triple"); fail!("Cannot determine OS from triple");
} }
#[cfg(target_os = "win32")] #[cfg(target_os = "windows")]
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
pub fn make_new_path(path: &str) -> String { pub fn make_new_path(path: &str) -> String {
// Windows just uses PATH as the library search path, so we have to // Windows just uses PATH as the library search path, so we have to
@@ -46,10 +49,12 @@ pub fn make_new_path(path: &str) -> String {
} }
} }
#[cfg(target_os = "win32")] #[cfg(target_os = "windows")]
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
pub fn lib_path_env_var() -> &'static str { "PATH" } pub fn lib_path_env_var() -> &'static str { "PATH" }
#[cfg(target_os = "win32")] #[cfg(target_os = "windows")]
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
pub fn path_div() -> &'static str { ";" } pub fn path_div() -> &'static str { ";" }
pub fn logv(config: &Config, s: String) { pub fn logv(config: &Config, s: String) {

4
src/etc/mklldeps.py
View File

@@ -61,13 +61,15 @@ for llconfig in sys.argv[4:]:
elif 'android' in os: elif 'android' in os:
os = 'android' os = 'android'
elif 'win' in os or 'mingw' in os: elif 'win' in os or 'mingw' in os:
os = 'win32' os = 'windows'
cfg = [ cfg = [
"target_arch = \"" + arch + "\"", "target_arch = \"" + arch + "\"",
"target_os = \"" + os + "\"", "target_os = \"" + os + "\"",
] ]
f.write("#[cfg(" + ', '.join(cfg) + ")]\n") 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() version = run([llconfig, '--version']).strip()

21
src/liblibc/lib.rs
View File

@@ -1138,7 +1138,8 @@ pub mod types {
} }
} }
#[cfg(target_os = "win32")] #[cfg(target_os = "windows")]
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
pub mod os { pub mod os {
pub mod common { pub mod common {
pub mod posix01 { pub mod posix01 {
@@ -1803,7 +1804,8 @@ pub mod consts {
// Consts tend to vary per OS so we pull their definitions out // Consts tend to vary per OS so we pull their definitions out
// into this module. // into this module.
#[cfg(target_os = "win32")] #[cfg(target_os = "windows")]
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
pub mod os { pub mod os {
pub mod c95 { pub mod c95 {
use types::os::arch::c95::{c_int, c_uint}; use types::os::arch::c95::{c_int, c_uint};
@@ -3887,7 +3889,8 @@ pub mod funcs {
// so be careful when trying to write portable code; it won't always work // so be careful when trying to write portable code; it won't always work
// with the same POSIX functions and types as other platforms. // with the same POSIX functions and types as other platforms.
#[cfg(target_os = "win32")] #[cfg(target_os = "windows")]
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
pub mod posix88 { pub mod posix88 {
pub mod stat_ { pub mod stat_ {
use types::os::common::posix01::{stat, utimbuf}; use types::os::common::posix01::{stat, utimbuf};
@@ -4316,7 +4319,8 @@ pub mod funcs {
} }
} }
#[cfg(target_os = "win32")] #[cfg(target_os = "windows")]
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
pub mod posix01 { pub mod posix01 {
pub mod stat_ { pub mod stat_ {
} }
@@ -4332,7 +4336,8 @@ pub mod funcs {
} }
#[cfg(target_os = "win32")] #[cfg(target_os = "windows")]
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
#[cfg(target_os = "android")] #[cfg(target_os = "android")]
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
@@ -4470,7 +4475,8 @@ pub mod funcs {
} }
#[cfg(target_os = "win32")] #[cfg(target_os = "windows")]
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
pub mod bsd44 { pub mod bsd44 {
} }
@@ -4496,7 +4502,8 @@ pub mod funcs {
} }
#[cfg(target_os = "win32")] #[cfg(target_os = "windows")]
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
pub mod extra { pub mod extra {
pub mod kernel32 { pub mod kernel32 {

3
src/libnative/io/mod.rs
View File

@@ -58,7 +58,8 @@ pub mod file;
#[path = "timer_unix.rs"] #[path = "timer_unix.rs"]
pub mod timer; pub mod timer;
#[cfg(target_os = "win32")] #[cfg(target_os = "windows")]
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
#[path = "timer_win32.rs"] #[path = "timer_win32.rs"]
pub mod timer; pub mod timer;

14
src/librustc/back/link.rs
View File

@@ -200,7 +200,7 @@ pub mod write {
// OSX has -dead_strip, which doesn't rely on ffunction_sections // OSX has -dead_strip, which doesn't rely on ffunction_sections
// FIXME(#13846) this should be enabled for windows // FIXME(#13846) this should be enabled for windows
let ffunction_sections = sess.targ_cfg.os != abi::OsMacos && let ffunction_sections = sess.targ_cfg.os != abi::OsMacos &&
sess.targ_cfg.os != abi::OsWin32; sess.targ_cfg.os != abi::OsWindows;
let fdata_sections = ffunction_sections; let fdata_sections = ffunction_sections;
let reloc_model = match sess.opts.cg.relocation_model.as_slice() { let reloc_model = match sess.opts.cg.relocation_model.as_slice() {
@@ -858,7 +858,7 @@ pub fn get_cc_prog(sess: &Session) -> String {
// instead of hard-coded gcc. // instead of hard-coded gcc.
// For win32, there is no cc command, so we add a condition to make it use gcc. // For win32, there is no cc command, so we add a condition to make it use gcc.
match sess.targ_cfg.os { match sess.targ_cfg.os {
abi::OsWin32 => "gcc", abi::OsWindows => "gcc",
_ => "cc", _ => "cc",
}.to_string() }.to_string()
} }
@@ -954,7 +954,7 @@ pub fn filename_for_input(sess: &Session,
} }
config::CrateTypeDylib => { config::CrateTypeDylib => {
let (prefix, suffix) = match sess.targ_cfg.os { let (prefix, suffix) = match sess.targ_cfg.os {
abi::OsWin32 => (loader::WIN32_DLL_PREFIX, loader::WIN32_DLL_SUFFIX), abi::OsWindows => (loader::WIN32_DLL_PREFIX, loader::WIN32_DLL_SUFFIX),
abi::OsMacos => (loader::MACOS_DLL_PREFIX, loader::MACOS_DLL_SUFFIX), abi::OsMacos => (loader::MACOS_DLL_PREFIX, loader::MACOS_DLL_SUFFIX),
abi::OsLinux => (loader::LINUX_DLL_PREFIX, loader::LINUX_DLL_SUFFIX), abi::OsLinux => (loader::LINUX_DLL_PREFIX, loader::LINUX_DLL_SUFFIX),
abi::OsAndroid => (loader::ANDROID_DLL_PREFIX, loader::ANDROID_DLL_SUFFIX), abi::OsAndroid => (loader::ANDROID_DLL_PREFIX, loader::ANDROID_DLL_SUFFIX),
@@ -972,7 +972,7 @@ pub fn filename_for_input(sess: &Session,
} }
config::CrateTypeExecutable => { config::CrateTypeExecutable => {
match sess.targ_cfg.os { match sess.targ_cfg.os {
abi::OsWin32 => out_filename.with_extension("exe"), abi::OsWindows => out_filename.with_extension("exe"),
abi::OsMacos | abi::OsMacos |
abi::OsLinux | abi::OsLinux |
abi::OsAndroid | abi::OsAndroid |
@@ -1388,7 +1388,7 @@ fn link_args(cmd: &mut Command,
// subset we wanted. // subset we wanted.
// //
// FIXME(#11937) we should invoke the system linker directly // FIXME(#11937) we should invoke the system linker directly
if sess.targ_cfg.os != abi::OsWin32 { if sess.targ_cfg.os != abi::OsWindows {
cmd.arg("-nodefaultlibs"); cmd.arg("-nodefaultlibs");
} }
@@ -1440,7 +1440,7 @@ fn link_args(cmd: &mut Command,
cmd.arg("-Wl,-dead_strip"); cmd.arg("-Wl,-dead_strip");
} }
if sess.targ_cfg.os == abi::OsWin32 { if sess.targ_cfg.os == abi::OsWindows {
// Make sure that we link to the dynamic libgcc, otherwise cross-module // Make sure that we link to the dynamic libgcc, otherwise cross-module
// DWARF stack unwinding will not work. // DWARF stack unwinding will not work.
// This behavior may be overridden by --link-args "-static-libgcc" // This behavior may be overridden by --link-args "-static-libgcc"
@@ -1715,7 +1715,7 @@ fn add_upstream_rust_crates(cmd: &mut Command, sess: &Session,
// Converts a library file-stem into a cc -l argument // Converts a library file-stem into a cc -l argument
fn unlib<'a>(config: &config::Config, stem: &'a [u8]) -> &'a [u8] { fn unlib<'a>(config: &config::Config, stem: &'a [u8]) -> &'a [u8] {
if stem.starts_with("lib".as_bytes()) && config.os != abi::OsWin32 { if stem.starts_with("lib".as_bytes()) && config.os != abi::OsWindows {
stem.tailn(3) stem.tailn(3)
} else { } else {
stem stem

9
src/librustc/driver/config.rs
View File

@@ -390,7 +390,7 @@ pub fn default_lib_output() -> CrateType {
pub fn default_configuration(sess: &Session) -> ast::CrateConfig { pub fn default_configuration(sess: &Session) -> ast::CrateConfig {
let tos = match sess.targ_cfg.os { let tos = match sess.targ_cfg.os {
abi::OsWin32 => InternedString::new("win32"), abi::OsWindows => InternedString::new("windows"),
abi::OsMacos => InternedString::new("macos"), abi::OsMacos => InternedString::new("macos"),
abi::OsLinux => InternedString::new("linux"), abi::OsLinux => InternedString::new("linux"),
abi::OsAndroid => InternedString::new("android"), abi::OsAndroid => InternedString::new("android"),
@@ -410,7 +410,7 @@ pub fn default_configuration(sess: &Session) -> ast::CrateConfig {
}; };
let fam = match sess.targ_cfg.os { let fam = match sess.targ_cfg.os {
abi::OsWin32 => InternedString::new("windows"), abi::OsWindows => InternedString::new("windows"),
_ => InternedString::new("unix") _ => InternedString::new("unix")
}; };
@@ -452,8 +452,9 @@ pub fn get_os(triple: &str) -> Option<abi::Os> {
None None
} }
static os_names : &'static [(&'static str, abi::Os)] = &[ static os_names : &'static [(&'static str, abi::Os)] = &[
("mingw32", abi::OsWin32), ("mingw32", abi::OsWindows),
("win32", abi::OsWin32), ("win32", abi::OsWindows),
("windows", abi::OsWindows),
("darwin", abi::OsMacos), ("darwin", abi::OsMacos),
("android", abi::OsAndroid), ("android", abi::OsAndroid),
("linux", abi::OsLinux), ("linux", abi::OsLinux),

6
src/librustc/metadata/loader.rs
View File

@@ -615,7 +615,7 @@ impl<'a> Context<'a> {
// dynamic libraries // dynamic libraries
fn dylibname(&self) -> Option<(&'static str, &'static str)> { fn dylibname(&self) -> Option<(&'static str, &'static str)> {
match self.os { match self.os {
abi::OsWin32 => Some((WIN32_DLL_PREFIX, WIN32_DLL_SUFFIX)), abi::OsWindows => Some((WIN32_DLL_PREFIX, WIN32_DLL_SUFFIX)),
abi::OsMacos => Some((MACOS_DLL_PREFIX, MACOS_DLL_SUFFIX)), abi::OsMacos => Some((MACOS_DLL_PREFIX, MACOS_DLL_SUFFIX)),
abi::OsLinux => Some((LINUX_DLL_PREFIX, LINUX_DLL_SUFFIX)), abi::OsLinux => Some((LINUX_DLL_PREFIX, LINUX_DLL_SUFFIX)),
abi::OsAndroid => Some((ANDROID_DLL_PREFIX, ANDROID_DLL_SUFFIX)), abi::OsAndroid => Some((ANDROID_DLL_PREFIX, ANDROID_DLL_SUFFIX)),
@@ -824,7 +824,7 @@ pub fn meta_section_name(os: abi::Os) -> Option<&'static str> {
match os { match os {
abi::OsMacos => Some("__DATA,__note.rustc"), abi::OsMacos => Some("__DATA,__note.rustc"),
abi::OsiOS => Some("__DATA,__note.rustc"), abi::OsiOS => Some("__DATA,__note.rustc"),
abi::OsWin32 => Some(".note.rustc"), abi::OsWindows => Some(".note.rustc"),
abi::OsLinux => Some(".note.rustc"), abi::OsLinux => Some(".note.rustc"),
abi::OsAndroid => Some(".note.rustc"), abi::OsAndroid => Some(".note.rustc"),
abi::OsFreebsd => Some(".note.rustc"), abi::OsFreebsd => Some(".note.rustc"),
@@ -836,7 +836,7 @@ pub fn read_meta_section_name(os: abi::Os) -> &'static str {
match os { match os {
abi::OsMacos => "__note.rustc", abi::OsMacos => "__note.rustc",
abi::OsiOS => unreachable!(), abi::OsiOS => unreachable!(),
abi::OsWin32 => ".note.rustc", abi::OsWindows => ".note.rustc",
abi::OsLinux => ".note.rustc", abi::OsLinux => ".note.rustc",
abi::OsAndroid => ".note.rustc", abi::OsAndroid => ".note.rustc",
abi::OsFreebsd => ".note.rustc", abi::OsFreebsd => ".note.rustc",

4
src/librustc/middle/trans/cabi.rs
View File

@@ -18,7 +18,7 @@ use middle::trans::cabi_arm;
use middle::trans::cabi_mips; use middle::trans::cabi_mips;
use middle::trans::type_::Type; use middle::trans::type_::Type;
use syntax::abi::{X86, X86_64, Arm, Mips, Mipsel}; use syntax::abi::{X86, X86_64, Arm, Mips, Mipsel};
use syntax::abi::{OsWin32}; use syntax::abi::{OsWindows};
#[deriving(Clone, PartialEq)] #[deriving(Clone, PartialEq)]
pub enum ArgKind { pub enum ArgKind {
@@ -110,7 +110,7 @@ pub fn compute_abi_info(ccx: &CrateContext,
match ccx.sess().targ_cfg.arch { match ccx.sess().targ_cfg.arch {
X86 => cabi_x86::compute_abi_info(ccx, atys, rty, ret_def), X86 => cabi_x86::compute_abi_info(ccx, atys, rty, ret_def),
X86_64 => X86_64 =>
if ccx.sess().targ_cfg.os == OsWin32 { if ccx.sess().targ_cfg.os == OsWindows {
cabi_x86_win64::compute_abi_info(ccx, atys, rty, ret_def) cabi_x86_win64::compute_abi_info(ccx, atys, rty, ret_def)
} else { } else {
cabi_x86_64::compute_abi_info(ccx, atys, rty, ret_def) cabi_x86_64::compute_abi_info(ccx, atys, rty, ret_def)

4
src/librustc/middle/trans/cabi_x86.rs
View File

@@ -9,7 +9,7 @@
// except according to those terms. // except according to those terms.
use syntax::abi::{OsWin32, OsMacos, OsiOS}; use syntax::abi::{OsWindows, OsMacos, OsiOS};
use llvm::*; use llvm::*;
use super::cabi::*; use super::cabi::*;
use super::common::*; use super::common::*;
@@ -36,7 +36,7 @@ pub fn compute_abi_info(ccx: &CrateContext,
enum Strategy { RetValue(Type), RetPointer } enum Strategy { RetValue(Type), RetPointer }
let strategy = match ccx.sess().targ_cfg.os { let strategy = match ccx.sess().targ_cfg.os {
OsWin32 | OsMacos | OsiOS => { OsWindows | OsMacos | OsiOS => {
match llsize_of_alloc(ccx, rty) { match llsize_of_alloc(ccx, rty) {
1 => RetValue(Type::i8(ccx)), 1 => RetValue(Type::i8(ccx)),
2 => RetValue(Type::i16(ccx)), 2 => RetValue(Type::i16(ccx)),

2
src/librustc_back/archive.rs
View File

@@ -98,7 +98,7 @@ fn run_ar(handler: &ErrorHandler, maybe_ar_prog: &Option<String>,
pub fn find_library(name: &str, os: abi::Os, search_paths: &[Path], pub fn find_library(name: &str, os: abi::Os, search_paths: &[Path],
handler: &ErrorHandler) -> Path { handler: &ErrorHandler) -> Path {
let (osprefix, osext) = match os { let (osprefix, osext) = match os {
abi::OsWin32 => ("", "lib"), _ => ("lib", "a"), abi::OsWindows => ("", "lib"), _ => ("lib", "a"),
}; };
// On Windows, static libraries sometimes show up as libfoo.a and other // On Windows, static libraries sometimes show up as libfoo.a and other
// times show up as foo.lib // times show up as foo.lib

2
src/librustc_back/arm.rs
View File

@@ -37,7 +37,7 @@ pub fn get_target_strs(target_triple: String, target_os: abi::Os) -> target_strs
-a0:0:64-n32".to_string() -a0:0:64-n32".to_string()
} }
abi::OsWin32 => { abi::OsWindows => {
"e-p:32:32:32\ "e-p:32:32:32\
-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\ -i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\
-f32:32:32-f64:64:64\ -f32:32:32-f64:64:64\

2
src/librustc_back/mips.rs
View File

@@ -32,7 +32,7 @@ pub fn get_target_strs(target_triple: String, target_os: abi::Os) -> target_strs
-a0:0:64-n32".to_string() -a0:0:64-n32".to_string()
} }
abi::OsWin32 => { abi::OsWindows => {
"E-p:32:32:32\ "E-p:32:32:32\
-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\ -i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\
-f32:32:32-f64:64:64\ -f32:32:32-f64:64:64\

2
src/librustc_back/mipsel.rs
View File

@@ -32,7 +32,7 @@ pub fn get_target_strs(target_triple: String, target_os: abi::Os) -> target_strs
-a0:0:64-n32".to_string() -a0:0:64-n32".to_string()
} }
abi::OsWin32 => { abi::OsWindows => {
"e-p:32:32:32\ "e-p:32:32:32\
-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\ -i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\
-f32:32:32-f64:64:64\ -f32:32:32-f64:64:64\

6
src/librustc_back/rpath.rs
View File

@@ -26,7 +26,7 @@ pub struct RPathConfig<'a> {
pub fn get_rpath_flags(config: RPathConfig) -> Vec<String> { pub fn get_rpath_flags(config: RPathConfig) -> Vec<String> {
// No rpath on windows // No rpath on windows
if config.os == abi::OsWin32 { if config.os == abi::OsWindows {
return Vec::new(); return Vec::new();
} }
@@ -107,14 +107,14 @@ fn get_rpath_relative_to_output(config: &mut RPathConfig,
lib: &Path) -> String { lib: &Path) -> String {
use std::os; use std::os;
assert!(config.os != abi::OsWin32); assert!(config.os != abi::OsWindows);
// Mac doesn't appear to support $ORIGIN // Mac doesn't appear to support $ORIGIN
let prefix = match config.os { let prefix = match config.os {
abi::OsAndroid | abi::OsLinux | abi::OsFreebsd | abi::OsDragonfly abi::OsAndroid | abi::OsLinux | abi::OsFreebsd | abi::OsDragonfly
=> "$ORIGIN", => "$ORIGIN",
abi::OsMacos => "@loader_path", abi::OsMacos => "@loader_path",
abi::OsWin32 | abi::OsiOS => unreachable!() abi::OsWindows | abi::OsiOS => unreachable!()
}; };
let mut lib = (config.realpath)(&os::make_absolute(lib)).unwrap(); let mut lib = (config.realpath)(&os::make_absolute(lib)).unwrap();

2
src/librustc_back/x86.rs
View File

@@ -34,7 +34,7 @@ pub fn get_target_strs(target_triple: String, target_os: abi::Os)
-n8:16:32".to_string() -n8:16:32".to_string()
} }
abi::OsWin32 => { abi::OsWindows => {
"e-p:32:32-f64:64:64-i64:64:64-f80:32:32-n8:16:32".to_string() "e-p:32:32-f64:64:64-i64:64:64-f80:32:32-n8:16:32".to_string()
} }

2
src/librustc_back/x86_64.rs
View File

@@ -29,7 +29,7 @@ pub fn get_target_strs(target_triple: String, target_os: abi::Os) -> target_strs
s0:64:64-f80:128:128-n8:16:32:64".to_string() s0:64:64-f80:128:128-n8:16:32:64".to_string()
} }
abi::OsWin32 => { abi::OsWindows => {
// FIXME: Test this. Copied from linux (#2398) // FIXME: Test this. Copied from linux (#2398)
"e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-\ "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-\
f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-\ f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-\

6
src/librustdoc/plugins.rs
View File

@@ -73,7 +73,8 @@ impl PluginManager {
} }
} }
#[cfg(target_os="win32")] #[cfg(target_os = "windows")]
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
fn libname(mut n: String) -> String { fn libname(mut n: String) -> String {
n.push_str(".dll"); n.push_str(".dll");
n n
@@ -85,7 +86,8 @@ fn libname(mut n: String) -> String {
n n
} }
#[cfg(not(target_os="win32"), not(target_os="macos"))] #[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
fn libname(n: String) -> String { fn libname(n: String) -> String {
let mut i = String::from_str("lib"); let mut i = String::from_str("lib");
i.push_str(n.as_slice()); i.push_str(n.as_slice());

3
src/librustrt/args.rs
View File

@@ -147,7 +147,8 @@ mod imp {
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
#[cfg(target_os = "ios")] #[cfg(target_os = "ios")]
#[cfg(target_os = "win32")] #[cfg(target_os = "windows")]
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
mod imp { mod imp {
use core::prelude::*; use core::prelude::*;
use collections::vec::Vec; use collections::vec::Vec;

3
src/librustrt/libunwind.rs
View File

@@ -86,7 +86,8 @@ pub type _Unwind_Exception_Cleanup_Fn =
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
#[cfg(target_os = "freebsd")] #[cfg(target_os = "freebsd")]
#[cfg(target_os = "win32")] #[cfg(target_os = "windows")]
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
#[link(name = "gcc_s")] #[link(name = "gcc_s")]
extern {} extern {}

12
src/librustrt/stack.rs
View File

@@ -199,7 +199,8 @@ pub unsafe fn record_sp_limit(limit: uint) {
unsafe fn target_record_sp_limit(limit: uint) { unsafe fn target_record_sp_limit(limit: uint) {
asm!("movq $0, %fs:112" :: "r"(limit) :: "volatile") asm!("movq $0, %fs:112" :: "r"(limit) :: "volatile")
} }
#[cfg(target_arch = "x86_64", target_os = "win32")] #[inline(always)] #[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) { unsafe fn target_record_sp_limit(limit: uint) {
// see: http://en.wikipedia.org/wiki/Win32_Thread_Information_Block // see: http://en.wikipedia.org/wiki/Win32_Thread_Information_Block
// store this inside of the "arbitrary data slot", but double the size // store this inside of the "arbitrary data slot", but double the size
@@ -227,7 +228,8 @@ pub unsafe fn record_sp_limit(limit: uint) {
unsafe fn target_record_sp_limit(limit: uint) { unsafe fn target_record_sp_limit(limit: uint) {
asm!("movl $0, %gs:48" :: "r"(limit) :: "volatile") asm!("movl $0, %gs:48" :: "r"(limit) :: "volatile")
} }
#[cfg(target_arch = "x86", target_os = "win32")] #[inline(always)] #[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) { unsafe fn target_record_sp_limit(limit: uint) {
// see: http://en.wikipedia.org/wiki/Win32_Thread_Information_Block // see: http://en.wikipedia.org/wiki/Win32_Thread_Information_Block
// store this inside of the "arbitrary data slot" // store this inside of the "arbitrary data slot"
@@ -280,7 +282,8 @@ pub unsafe fn get_sp_limit() -> uint {
asm!("movq %fs:112, $0" : "=r"(limit) ::: "volatile"); asm!("movq %fs:112, $0" : "=r"(limit) ::: "volatile");
return limit; return limit;
} }
#[cfg(target_arch = "x86_64", target_os = "win32")] #[inline(always)] #[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 { unsafe fn target_get_sp_limit() -> uint {
let limit; let limit;
asm!("movq %gs:0x28, $0" : "=r"(limit) ::: "volatile"); asm!("movq %gs:0x28, $0" : "=r"(limit) ::: "volatile");
@@ -316,7 +319,8 @@ pub unsafe fn get_sp_limit() -> uint {
asm!("movl %gs:48, $0" : "=r"(limit) ::: "volatile"); asm!("movl %gs:48, $0" : "=r"(limit) ::: "volatile");
return limit; return limit;
} }
#[cfg(target_arch = "x86", target_os = "win32")] #[inline(always)] #[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 { unsafe fn target_get_sp_limit() -> uint {
let limit; let limit;
asm!("movl %fs:0x14, $0" : "=r"(limit) ::: "volatile"); asm!("movl %fs:0x14, $0" : "=r"(limit) ::: "volatile");

3
src/librustuv/uvll.rs
View File

@@ -727,7 +727,8 @@ extern {}
#[link(name = "rt")] #[link(name = "rt")]
extern {} extern {}
#[cfg(target_os = "win32")] #[cfg(target_os = "windows")]
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
#[link(name = "ws2_32")] #[link(name = "ws2_32")]
#[link(name = "psapi")] #[link(name = "psapi")]
#[link(name = "iphlpapi")] #[link(name = "iphlpapi")]

3
src/libstd/dynamic_lib.rs
View File

@@ -278,7 +278,8 @@ pub mod dl {
} }
} }
#[cfg(target_os = "win32")] #[cfg(target_os = "windows")]
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
pub mod dl { pub mod dl {
use c_str::ToCStr; use c_str::ToCStr;
use iter::Iterator; use iter::Iterator;

5
src/libstd/os.rs
View File

@@ -1842,7 +1842,8 @@ pub mod consts {
pub static EXE_EXTENSION: &'static str = ""; pub static EXE_EXTENSION: &'static str = "";
} }
#[cfg(target_os = "win32")] #[cfg(target_os = "windows")]
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
pub mod consts { pub mod consts {
pub use os::arch_consts::ARCH; pub use os::arch_consts::ARCH;
@@ -1850,7 +1851,7 @@ pub mod consts {
/// A string describing the specific operating system in use: in this /// A string describing the specific operating system in use: in this
/// case, `win32`. /// case, `win32`.
pub static SYSNAME: &'static str = "win32"; pub static SYSNAME: &'static str = "windows";
/// Specifies the filename prefix used for shared libraries on this /// Specifies the filename prefix used for shared libraries on this
/// platform: in this case, the empty string. /// platform: in this case, the empty string.

16
src/libsyntax/abi.rs
View File

@@ -11,7 +11,7 @@
use std::fmt; use std::fmt;
#[deriving(PartialEq)] #[deriving(PartialEq)]
pub enum Os { OsWin32, OsMacos, OsLinux, OsAndroid, OsFreebsd, OsiOS, pub enum Os { OsWindows, OsMacos, OsLinux, OsAndroid, OsFreebsd, OsiOS,
OsDragonfly } OsDragonfly }
#[deriving(PartialEq, Eq, Hash, Encodable, Decodable, Clone)] #[deriving(PartialEq, Eq, Hash, Encodable, Decodable, Clone)]
@@ -124,7 +124,7 @@ impl Abi {
// Transform this ABI as appropriate for the requested os/arch // Transform this ABI as appropriate for the requested os/arch
// combination. // combination.
Some(match (*self, os, arch) { Some(match (*self, os, arch) {
(System, OsWin32, X86) => Stdcall, (System, OsWindows, X86) => Stdcall,
(System, _, _) => C, (System, _, _) => C,
(me, _, _) => me, (me, _, _) => me,
}) })
@@ -147,7 +147,7 @@ impl fmt::Show for Os {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match *self { match *self {
OsLinux => "linux".fmt(f), OsLinux => "linux".fmt(f),
OsWin32 => "win32".fmt(f), OsWindows => "windows".fmt(f),
OsMacos => "macos".fmt(f), OsMacos => "macos".fmt(f),
OsiOS => "ios".fmt(f), OsiOS => "ios".fmt(f),
OsAndroid => "android".fmt(f), OsAndroid => "android".fmt(f),
@@ -195,9 +195,9 @@ fn pick_uniplatform() {
assert_eq!(Stdcall.for_target(OsLinux, X86), Some(Stdcall)); assert_eq!(Stdcall.for_target(OsLinux, X86), Some(Stdcall));
assert_eq!(Stdcall.for_target(OsLinux, Arm), None); assert_eq!(Stdcall.for_target(OsLinux, Arm), None);
assert_eq!(System.for_target(OsLinux, X86), Some(C)); assert_eq!(System.for_target(OsLinux, X86), Some(C));
assert_eq!(System.for_target(OsWin32, X86), Some(Stdcall)); assert_eq!(System.for_target(OsWindows, X86), Some(Stdcall));
assert_eq!(System.for_target(OsWin32, X86_64), Some(C)); assert_eq!(System.for_target(OsWindows, X86_64), Some(C));
assert_eq!(System.for_target(OsWin32, Arm), Some(C)); assert_eq!(System.for_target(OsWindows, Arm), Some(C));
assert_eq!(Stdcall.for_target(OsWin32, X86), Some(Stdcall)); assert_eq!(Stdcall.for_target(OsWindows, X86), Some(Stdcall));
assert_eq!(Stdcall.for_target(OsWin32, X86_64), Some(Stdcall)); assert_eq!(Stdcall.for_target(OsWindows, X86_64), Some(Stdcall));
} }

2
src/test/bench/shootout-regex-dna.rs
View File

@@ -39,7 +39,7 @@
// OF THE POSSIBILITY OF SUCH DAMAGE. // OF THE POSSIBILITY OF SUCH DAMAGE.
// FIXME(#13725) windows needs fixing. // FIXME(#13725) windows needs fixing.
// ignore-win32 // ignore-windows
// ignore-stage1 // ignore-stage1
// ignore-cross-compile #12102 // ignore-cross-compile #12102

2
src/test/compile-fail-fulldeps/syntax-extension-regex-invalid.rs
View File

@@ -9,7 +9,7 @@
// except according to those terms. // except according to those terms.
// FIXME(#13725) windows needs fixing. // FIXME(#13725) windows needs fixing.
// ignore-win32 // ignore-windows
// ignore-stage1 // ignore-stage1
#![feature(phase)] #![feature(phase)]

2
src/test/compile-fail-fulldeps/syntax-extension-regex-unused-static.rs
View File

@@ -9,7 +9,7 @@
// except according to those terms. // except according to those terms.
// FIXME(#13725) windows needs fixing. // FIXME(#13725) windows needs fixing.
// ignore-win32 // ignore-windows
// ignore-stage1 // ignore-stage1
#![feature(phase)] #![feature(phase)]

2
src/test/compile-fail-fulldeps/syntax-extension-regex-unused.rs
View File

@@ -9,7 +9,7 @@
// except according to those terms. // except according to those terms.
// FIXME(#13725) windows needs fixing. // FIXME(#13725) windows needs fixing.
// ignore-win32 // ignore-windows
// ignore-stage1 // ignore-stage1
#![feature(phase)] #![feature(phase)]

2
src/test/debuginfo/basic-types-globals-metadata.rs
View File

@@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
// ignore-win32: FIXME #13256 // ignore-windows: FIXME #13256
// ignore-android: FIXME(#10381) // ignore-android: FIXME(#10381)
// compile-flags:-g // compile-flags:-g

2
src/test/debuginfo/basic-types-globals.rs
View File

@@ -14,7 +14,7 @@
// about UTF-32 character encoding and will print a rust char as only // about UTF-32 character encoding and will print a rust char as only
// its numerical value. // its numerical value.
// ignore-win32: FIXME #13256 // ignore-windows: FIXME #13256
// ignore-android: FIXME(#10381) // ignore-android: FIXME(#10381)
// compile-flags:-g // compile-flags:-g

2
src/test/debuginfo/basic-types-mut-globals.rs
View File

@@ -14,7 +14,7 @@
// about UTF-32 character encoding and will print a rust char as only // about UTF-32 character encoding and will print a rust char as only
// its numerical value. // its numerical value.
// ignore-win32: FIXME #13256 // ignore-windows: FIXME #13256
// ignore-android: FIXME(#10381) // ignore-android: FIXME(#10381)
// compile-flags:-g // compile-flags:-g

2
src/test/debuginfo/c-style-enum.rs
View File

@@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
// ignore-win32: FIXME #13256 // ignore-windows: FIXME #13256
// ignore-android: FIXME(#10381) // ignore-android: FIXME(#10381)
// compile-flags:-g // compile-flags:-g

2
src/test/debuginfo/lexical-scopes-in-block-expression.rs
View File

@@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
// ignore-win32: FIXME #13256 // ignore-windows: FIXME #13256
// ignore-android: FIXME(#10381) // ignore-android: FIXME(#10381)
// compile-flags:-g // compile-flags:-g

2
src/test/debuginfo/simple-struct.rs
View File

@@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
// ignore-win32: FIXME #13256 // ignore-windows: FIXME #13256
// ignore-android: FIXME(#10381) // ignore-android: FIXME(#10381)
// compile-flags:-g // compile-flags:-g

2
src/test/debuginfo/simple-tuple.rs
View File

@@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
// ignore-win32: FIXME #13256 // ignore-windows: FIXME #13256
// ignore-android: FIXME(#10381) // ignore-android: FIXME(#10381)
// compile-flags:-g // compile-flags:-g

2
src/test/debuginfo/vec-slices.rs
View File

@@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
// ignore-win32: FIXME #13256 // ignore-windows: FIXME #13256
// ignore-android: FIXME(#10381) // ignore-android: FIXME(#10381)
// compile-flags:-g // compile-flags:-g

2
src/test/debuginfo/vec.rs
View File

@@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
// ignore-win32: FIXME #13256 // ignore-windows: FIXME #13256
// ignore-android: FIXME(#10381) // ignore-android: FIXME(#10381)
// compile-flags:-g // compile-flags:-g

2
src/test/run-pass/backtrace.rs
View File

@@ -9,7 +9,7 @@
// except according to those terms. // except according to those terms.
// no-pretty-expanded FIXME #15189 // no-pretty-expanded FIXME #15189
// ignore-win32 FIXME #13259 // ignore-windows FIXME #13259
extern crate native; extern crate native;
use std::os; use std::os;

3
src/test/run-pass/dupe-first-attr.rc
View File

@@ -17,7 +17,8 @@ mod hello;
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
mod hello; mod hello;
#[cfg(target_os = "win32")] #[cfg(target_os = "windows")]
/* NOTE: Remove after snapshot */#[cfg(stage0, target_os = "win32")]
mod hello; mod hello;
#[cfg(target_os = "freebsd")] #[cfg(target_os = "freebsd")]

2
src/test/run-pass/glob-std.rs
View File

@@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
// ignore-win32 TempDir may cause IoError on windows: #10462 // ignore-windows TempDir may cause IoError on windows: #10462
#![feature(macro_rules)] #![feature(macro_rules)]

3
src/test/run-pass/intrinsic-alignment.rs
View File

@@ -42,7 +42,8 @@ mod m {
} }
} }
#[cfg(target_os = "win32")] #[cfg(target_os = "windows")]
/* NOTE: Remove after snapshot */#[cfg(stage0, target_os = "win32")]
mod m { mod m {
#[main] #[main]
#[cfg(target_arch = "x86")] #[cfg(target_arch = "x86")]

2
src/test/run-pass/issue-14393.rs
View File

@@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
// ignore-win32: FIXME #13793 // ignore-windows: FIXME #13793
fn main() { fn main() {
match ("", 1u) { match ("", 1u) {

2
src/test/run-pass/issue-15487.rs
View File

@@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
// ignore-win32 // ignore-windows
#![feature(link_args)] #![feature(link_args)]

2
src/test/run-pass/lang-item-public.rs
View File

@@ -10,7 +10,7 @@
// aux-build:lang-item-public.rs // aux-build:lang-item-public.rs
// ignore-android // ignore-android
// ignore-win32 #13361 // ignore-windows #13361
#![no_std] #![no_std]

2
src/test/run-pass/linkage-visibility.rs
View File

@@ -10,7 +10,7 @@
// aux-build:linkage-visibility.rs // aux-build:linkage-visibility.rs
// ignore-android: FIXME(#10379) // ignore-android: FIXME(#10379)
// ignore-win32: std::dynamic_lib does not work on win32 well // ignore-windows: std::dynamic_lib does not work on win32 well
extern crate foo = "linkage-visibility"; extern crate foo = "linkage-visibility";

2
src/test/run-pass/linkage1.rs
View File

@@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
// ignore-win32 // ignore-windows
// ignore-android // ignore-android
// ignore-macos // ignore-macos
// aux-build:linkage1.rs // aux-build:linkage1.rs

2
src/test/run-pass/logging-only-prints-once.rs
View File

@@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
// ignore-win32 // ignore-windows
// exec-env:RUST_LOG=debug // exec-env:RUST_LOG=debug
use std::cell::Cell; use std::cell::Cell;

2
src/test/run-pass/logging-separate-lines.rs
View File

@@ -9,7 +9,7 @@
// except according to those terms. // except according to those terms.
// ignore-android // ignore-android
// ignore-win32 // ignore-windows
// exec-env:RUST_LOG=debug // exec-env:RUST_LOG=debug
#![feature(phase)] #![feature(phase)]

2
src/test/run-pass/process-detach.rs
View File

@@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
// ignore-win32 // ignore-windows
// ignore-android // ignore-android
// This test ensures that the 'detach' field on processes does the right thing. // This test ensures that the 'detach' field on processes does the right thing.

3
src/test/run-pass/rec-align-u64.rs
View File

@@ -55,7 +55,8 @@ mod m {
} }
} }
#[cfg(target_os = "win32")] #[cfg(target_os = "windows")]
/* NOTE: Remove after snapshot */#[cfg(stage0, target_os = "win32")]
mod m { mod m {
#[cfg(target_arch = "x86")] #[cfg(target_arch = "x86")]
pub mod m { pub mod m {

2
src/test/run-pass/signal-exit-status.rs
View File

@@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
// ignore-win32 // ignore-windows
extern crate debug; extern crate debug;

2
src/test/run-pass/spawning-with-debug.rs
View File

@@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
// ignore-win32 // ignore-windows
// exec-env:RUST_LOG=debug // exec-env:RUST_LOG=debug
// regression test for issue #10405, make sure we don't call println! too soon. // regression test for issue #10405, make sure we don't call println! too soon.

2
src/test/run-pass/tempfile.rs
View File

@@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
// ignore-win32 TempDir may cause IoError on windows: #10463 // ignore-windows TempDir may cause IoError on windows: #10463
// These tests are here to exercise the functionality of the `tempfile` module. // These tests are here to exercise the functionality of the `tempfile` module.
// One might expect these tests to be located in that module, but sadly they // One might expect these tests to be located in that module, but sadly they

2
src/test/run-pass/test-runner-hides-main.rs
View File

@@ -9,7 +9,7 @@
// except according to those terms. // except according to those terms.
// compile-flags:--test // compile-flags:--test
// ignore-win32 #10872 // ignore-windows #10872
// ignore-pretty: does not work well with `--test` // ignore-pretty: does not work well with `--test`
// Building as a test runner means that a synthetic main will be run, // Building as a test runner means that a synthetic main will be run,