From 98332b1a06193c4f83fc2613f72273b50b77f2b3 Mon Sep 17 00:00:00 2001 From: Vadim Chugunov Date: Mon, 11 Aug 2014 16:32:11 -0700 Subject: [PATCH 1/4] Replace all references to "Win32" with "Windows". For historical reasons, "Win32" has been used in Rust codebase to mean "Windows OS in general". This is confusing, especially now, that Rust supports Win64 builds. [breaking-change] --- src/librustc/back/link.rs | 14 +++++++------- src/librustc/driver/config.rs | 8 ++++---- src/librustc/metadata/loader.rs | 6 +++--- src/librustc/middle/trans/cabi.rs | 4 ++-- src/librustc/middle/trans/cabi_x86.rs | 4 ++-- src/librustc_back/archive.rs | 2 +- src/librustc_back/arm.rs | 2 +- src/librustc_back/mips.rs | 2 +- src/librustc_back/mipsel.rs | 2 +- src/librustc_back/rpath.rs | 6 +++--- src/librustc_back/x86.rs | 2 +- src/librustc_back/x86_64.rs | 2 +- src/libsyntax/abi.rs | 16 ++++++++-------- 13 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs index 7c9844dbe33fb..f3e130cf76860 100644 --- a/src/librustc/back/link.rs +++ b/src/librustc/back/link.rs @@ -200,7 +200,7 @@ pub mod write { // OSX has -dead_strip, which doesn't rely on ffunction_sections // FIXME(#13846) this should be enabled for windows 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 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. // For win32, there is no cc command, so we add a condition to make it use gcc. match sess.targ_cfg.os { - abi::OsWin32 => "gcc", + abi::OsWindows => "gcc", _ => "cc", }.to_string() } @@ -954,7 +954,7 @@ pub fn filename_for_input(sess: &Session, } config::CrateTypeDylib => { 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::OsLinux => (loader::LINUX_DLL_PREFIX, loader::LINUX_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 => { match sess.targ_cfg.os { - abi::OsWin32 => out_filename.with_extension("exe"), + abi::OsWindows => out_filename.with_extension("exe"), abi::OsMacos | abi::OsLinux | abi::OsAndroid | @@ -1388,7 +1388,7 @@ fn link_args(cmd: &mut Command, // subset we wanted. // // 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"); } @@ -1440,7 +1440,7 @@ fn link_args(cmd: &mut Command, 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 // DWARF stack unwinding will not work. // 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 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) } else { stem diff --git a/src/librustc/driver/config.rs b/src/librustc/driver/config.rs index f4309d9e51b56..263bd0f4d92d7 100644 --- a/src/librustc/driver/config.rs +++ b/src/librustc/driver/config.rs @@ -390,7 +390,7 @@ pub fn default_lib_output() -> CrateType { pub fn default_configuration(sess: &Session) -> ast::CrateConfig { let tos = match sess.targ_cfg.os { - abi::OsWin32 => InternedString::new("win32"), + abi::OsWindows => InternedString::new("win32"), abi::OsMacos => InternedString::new("macos"), abi::OsLinux => InternedString::new("linux"), abi::OsAndroid => InternedString::new("android"), @@ -410,7 +410,7 @@ pub fn default_configuration(sess: &Session) -> ast::CrateConfig { }; let fam = match sess.targ_cfg.os { - abi::OsWin32 => InternedString::new("windows"), + abi::OsWindows => InternedString::new("windows"), _ => InternedString::new("unix") }; @@ -452,8 +452,8 @@ pub fn get_os(triple: &str) -> Option { None } static os_names : &'static [(&'static str, abi::Os)] = &[ - ("mingw32", abi::OsWin32), - ("win32", abi::OsWin32), + ("mingw32", abi::OsWindows), + ("win32", abi::OsWindows), ("darwin", abi::OsMacos), ("android", abi::OsAndroid), ("linux", abi::OsLinux), diff --git a/src/librustc/metadata/loader.rs b/src/librustc/metadata/loader.rs index d2e1fca0da75d..cd8ebf5081ba7 100644 --- a/src/librustc/metadata/loader.rs +++ b/src/librustc/metadata/loader.rs @@ -615,7 +615,7 @@ impl<'a> Context<'a> { // dynamic libraries fn dylibname(&self) -> Option<(&'static str, &'static str)> { 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::OsLinux => Some((LINUX_DLL_PREFIX, LINUX_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 { abi::OsMacos => 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::OsAndroid => 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 { abi::OsMacos => "__note.rustc", abi::OsiOS => unreachable!(), - abi::OsWin32 => ".note.rustc", + abi::OsWindows => ".note.rustc", abi::OsLinux => ".note.rustc", abi::OsAndroid => ".note.rustc", abi::OsFreebsd => ".note.rustc", diff --git a/src/librustc/middle/trans/cabi.rs b/src/librustc/middle/trans/cabi.rs index 52461e3fdcb23..d419a56ec148e 100644 --- a/src/librustc/middle/trans/cabi.rs +++ b/src/librustc/middle/trans/cabi.rs @@ -18,7 +18,7 @@ use middle::trans::cabi_arm; use middle::trans::cabi_mips; use middle::trans::type_::Type; use syntax::abi::{X86, X86_64, Arm, Mips, Mipsel}; -use syntax::abi::{OsWin32}; +use syntax::abi::{OsWindows}; #[deriving(Clone, PartialEq)] pub enum ArgKind { @@ -110,7 +110,7 @@ pub fn compute_abi_info(ccx: &CrateContext, match ccx.sess().targ_cfg.arch { X86 => cabi_x86::compute_abi_info(ccx, atys, rty, ret_def), 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) } else { cabi_x86_64::compute_abi_info(ccx, atys, rty, ret_def) diff --git a/src/librustc/middle/trans/cabi_x86.rs b/src/librustc/middle/trans/cabi_x86.rs index 6bb3d992f50c6..d9812677d64cb 100644 --- a/src/librustc/middle/trans/cabi_x86.rs +++ b/src/librustc/middle/trans/cabi_x86.rs @@ -9,7 +9,7 @@ // except according to those terms. -use syntax::abi::{OsWin32, OsMacos, OsiOS}; +use syntax::abi::{OsWindows, OsMacos, OsiOS}; use llvm::*; use super::cabi::*; use super::common::*; @@ -36,7 +36,7 @@ pub fn compute_abi_info(ccx: &CrateContext, enum Strategy { RetValue(Type), RetPointer } let strategy = match ccx.sess().targ_cfg.os { - OsWin32 | OsMacos | OsiOS => { + OsWindows | OsMacos | OsiOS => { match llsize_of_alloc(ccx, rty) { 1 => RetValue(Type::i8(ccx)), 2 => RetValue(Type::i16(ccx)), diff --git a/src/librustc_back/archive.rs b/src/librustc_back/archive.rs index 85e0f2f10d8dc..6e606f3336180 100644 --- a/src/librustc_back/archive.rs +++ b/src/librustc_back/archive.rs @@ -98,7 +98,7 @@ fn run_ar(handler: &ErrorHandler, maybe_ar_prog: &Option, pub fn find_library(name: &str, os: abi::Os, search_paths: &[Path], handler: &ErrorHandler) -> Path { 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 // times show up as foo.lib diff --git a/src/librustc_back/arm.rs b/src/librustc_back/arm.rs index 9bb90427e7ccf..134f7105ea76e 100644 --- a/src/librustc_back/arm.rs +++ b/src/librustc_back/arm.rs @@ -37,7 +37,7 @@ pub fn get_target_strs(target_triple: String, target_os: abi::Os) -> target_strs -a0:0:64-n32".to_string() } - abi::OsWin32 => { + abi::OsWindows => { "e-p:32:32:32\ -i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\ -f32:32:32-f64:64:64\ diff --git a/src/librustc_back/mips.rs b/src/librustc_back/mips.rs index 43bf3e8e4af38..322f001c31e1b 100644 --- a/src/librustc_back/mips.rs +++ b/src/librustc_back/mips.rs @@ -32,7 +32,7 @@ pub fn get_target_strs(target_triple: String, target_os: abi::Os) -> target_strs -a0:0:64-n32".to_string() } - abi::OsWin32 => { + abi::OsWindows => { "E-p:32:32:32\ -i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\ -f32:32:32-f64:64:64\ diff --git a/src/librustc_back/mipsel.rs b/src/librustc_back/mipsel.rs index 87f74e72504ac..e7ce5b0a429bc 100644 --- a/src/librustc_back/mipsel.rs +++ b/src/librustc_back/mipsel.rs @@ -32,7 +32,7 @@ pub fn get_target_strs(target_triple: String, target_os: abi::Os) -> target_strs -a0:0:64-n32".to_string() } - abi::OsWin32 => { + abi::OsWindows => { "e-p:32:32:32\ -i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\ -f32:32:32-f64:64:64\ diff --git a/src/librustc_back/rpath.rs b/src/librustc_back/rpath.rs index 94d197ad06a8d..98fdd5a7fd7db 100644 --- a/src/librustc_back/rpath.rs +++ b/src/librustc_back/rpath.rs @@ -26,7 +26,7 @@ pub struct RPathConfig<'a> { pub fn get_rpath_flags(config: RPathConfig) -> Vec { // No rpath on windows - if config.os == abi::OsWin32 { + if config.os == abi::OsWindows { return Vec::new(); } @@ -107,14 +107,14 @@ fn get_rpath_relative_to_output(config: &mut RPathConfig, lib: &Path) -> String { use std::os; - assert!(config.os != abi::OsWin32); + assert!(config.os != abi::OsWindows); // Mac doesn't appear to support $ORIGIN let prefix = match config.os { abi::OsAndroid | abi::OsLinux | abi::OsFreebsd | abi::OsDragonfly => "$ORIGIN", abi::OsMacos => "@loader_path", - abi::OsWin32 | abi::OsiOS => unreachable!() + abi::OsWindows | abi::OsiOS => unreachable!() }; let mut lib = (config.realpath)(&os::make_absolute(lib)).unwrap(); diff --git a/src/librustc_back/x86.rs b/src/librustc_back/x86.rs index 3c444806e13e5..21c4fd424748f 100644 --- a/src/librustc_back/x86.rs +++ b/src/librustc_back/x86.rs @@ -34,7 +34,7 @@ pub fn get_target_strs(target_triple: String, target_os: abi::Os) -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() } diff --git a/src/librustc_back/x86_64.rs b/src/librustc_back/x86_64.rs index b4b5765986bab..43c4d646ec940 100644 --- a/src/librustc_back/x86_64.rs +++ b/src/librustc_back/x86_64.rs @@ -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() } - abi::OsWin32 => { + abi::OsWindows => { // 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-\ f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-\ diff --git a/src/libsyntax/abi.rs b/src/libsyntax/abi.rs index c50a5661973f5..77b0f91f33b67 100644 --- a/src/libsyntax/abi.rs +++ b/src/libsyntax/abi.rs @@ -11,7 +11,7 @@ use std::fmt; #[deriving(PartialEq)] -pub enum Os { OsWin32, OsMacos, OsLinux, OsAndroid, OsFreebsd, OsiOS, +pub enum Os { OsWindows, OsMacos, OsLinux, OsAndroid, OsFreebsd, OsiOS, OsDragonfly } #[deriving(PartialEq, Eq, Hash, Encodable, Decodable, Clone)] @@ -124,7 +124,7 @@ impl Abi { // Transform this ABI as appropriate for the requested os/arch // combination. Some(match (*self, os, arch) { - (System, OsWin32, X86) => Stdcall, + (System, OsWindows, X86) => Stdcall, (System, _, _) => C, (me, _, _) => me, }) @@ -147,7 +147,7 @@ impl fmt::Show for Os { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { match *self { OsLinux => "linux".fmt(f), - OsWin32 => "win32".fmt(f), + OsWindows => "win32".fmt(f), OsMacos => "macos".fmt(f), OsiOS => "ios".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, Arm), None); assert_eq!(System.for_target(OsLinux, X86), Some(C)); - assert_eq!(System.for_target(OsWin32, X86), Some(Stdcall)); - assert_eq!(System.for_target(OsWin32, X86_64), Some(C)); - assert_eq!(System.for_target(OsWin32, Arm), Some(C)); - assert_eq!(Stdcall.for_target(OsWin32, X86), Some(Stdcall)); - assert_eq!(Stdcall.for_target(OsWin32, X86_64), Some(Stdcall)); + assert_eq!(System.for_target(OsWindows, X86), Some(Stdcall)); + assert_eq!(System.for_target(OsWindows, X86_64), Some(C)); + assert_eq!(System.for_target(OsWindows, Arm), Some(C)); + assert_eq!(Stdcall.for_target(OsWindows, X86), Some(Stdcall)); + assert_eq!(Stdcall.for_target(OsWindows, X86_64), Some(Stdcall)); } From 3dfd12967aed35b7788f7d3c7460b76b76e70b60 Mon Sep 17 00:00:00 2001 From: Vadim Chugunov Date: Sun, 10 Aug 2014 21:26:45 -0700 Subject: [PATCH 2/4] Replace #[cfg(target_os = "win32")] with #[cfg(target_os = "windows")] --- src/compiletest/runtest.rs | 15 ++++++++++----- src/compiletest/util.rs | 17 +++++++++++------ src/etc/mklldeps.py | 4 +++- src/liblibc/lib.rs | 21 ++++++++++++++------- src/libnative/io/mod.rs | 3 ++- src/librustc/driver/config.rs | 3 ++- src/librustdoc/plugins.rs | 6 ++++-- src/librustrt/args.rs | 3 ++- src/librustrt/libunwind.rs | 3 ++- src/librustrt/stack.rs | 12 ++++++++---- src/librustuv/uvll.rs | 3 ++- src/libstd/dynamic_lib.rs | 3 ++- src/libstd/os.rs | 5 +++-- src/libsyntax/abi.rs | 2 +- src/test/run-pass/dupe-first-attr.rc | 3 ++- src/test/run-pass/intrinsic-alignment.rs | 3 ++- src/test/run-pass/rec-align-u64.rs | 3 ++- 17 files changed, 72 insertions(+), 37 deletions(-) diff --git a/src/compiletest/runtest.rs b/src/compiletest/runtest.rs index a9c7673d4ddfb..940b1f185cfad 100644 --- a/src/compiletest/runtest.rs +++ b/src/compiletest/runtest.rs @@ -16,7 +16,8 @@ use header::TestProps; use header; use procsrv; use util::logv; -#[cfg(target_os = "win32")] +#[cfg(target_os = "windows")] +#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot use util; use std::io::File; @@ -816,7 +817,8 @@ fn check_expected_errors(expected_errors: Vec , format!("{}:{}:", testfile.display(), ee.line) }).collect:: >(); - #[cfg(target_os = "win32")] + #[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 = i.map( |c| { @@ -829,7 +831,8 @@ fn check_expected_errors(expected_errors: Vec , 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 { to_lower(line).as_slice().starts_with(to_lower(prefix).as_slice()) } @@ -1246,14 +1249,16 @@ fn make_cmdline(_libpath: &str, prog: &str, args: &[String]) -> String { 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 { format!("{} {} {}", lib_path_cmd_prefix(libpath), prog, args.connect(" ")) } // Build the LD_LIBRARY_PATH variable as it would be seen on the command line // 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 { format!("{}=\"{}\"", util::lib_path_env_var(), util::make_new_path(path)) } diff --git a/src/compiletest/util.rs b/src/compiletest/util.rs index 445e814a1eb04..8947856e332a7 100644 --- a/src/compiletest/util.rs +++ b/src/compiletest/util.rs @@ -10,13 +10,15 @@ use common::Config; -#[cfg(target_os = "win32")] +#[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 static OS_TABLE: &'static [(&'static str, &'static str)] = &[ - ("mingw32", "win32"), - ("win32", "win32"), + ("mingw32", "windows"), + ("win32", "windows"), + ("windows", "windows"), ("darwin", "macos"), ("android", "android"), ("linux", "linux"), @@ -33,7 +35,8 @@ pub fn get_os(triple: &str) -> &'static str { 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 { // 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" } -#[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 logv(config: &Config, s: String) { diff --git a/src/etc/mklldeps.py b/src/etc/mklldeps.py index 113c192ec07bf..5d0f35fbd6064 100644 --- a/src/etc/mklldeps.py +++ b/src/etc/mklldeps.py @@ -61,13 +61,15 @@ def run(args): elif 'android' in os: os = 'android' elif 'win' in os or 'mingw' in os: - os = 'win32' + os = 'windows' cfg = [ "target_arch = \"" + arch + "\"", "target_os = \"" + os + "\"", ] 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() diff --git a/src/liblibc/lib.rs b/src/liblibc/lib.rs index e368a5644159c..c005ae7148051 100644 --- a/src/liblibc/lib.rs +++ b/src/liblibc/lib.rs @@ -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 common { pub mod posix01 { @@ -1803,7 +1804,8 @@ pub mod consts { // Consts tend to vary per OS so we pull their definitions out // 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 c95 { 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 // 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 stat_ { 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 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 = "android")] #[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 { } @@ -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 kernel32 { diff --git a/src/libnative/io/mod.rs b/src/libnative/io/mod.rs index db5421481ee42..afd818bd7d7e7 100644 --- a/src/libnative/io/mod.rs +++ b/src/libnative/io/mod.rs @@ -58,7 +58,8 @@ pub mod file; #[path = "timer_unix.rs"] pub mod timer; -#[cfg(target_os = "win32")] +#[cfg(target_os = "windows")] +#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot #[path = "timer_win32.rs"] pub mod timer; diff --git a/src/librustc/driver/config.rs b/src/librustc/driver/config.rs index 263bd0f4d92d7..33bf1c8b9643c 100644 --- a/src/librustc/driver/config.rs +++ b/src/librustc/driver/config.rs @@ -390,7 +390,7 @@ pub fn default_lib_output() -> CrateType { pub fn default_configuration(sess: &Session) -> ast::CrateConfig { let tos = match sess.targ_cfg.os { - abi::OsWindows => InternedString::new("win32"), + abi::OsWindows => InternedString::new("windows"), abi::OsMacos => InternedString::new("macos"), abi::OsLinux => InternedString::new("linux"), abi::OsAndroid => InternedString::new("android"), @@ -454,6 +454,7 @@ pub fn get_os(triple: &str) -> Option { static os_names : &'static [(&'static str, abi::Os)] = &[ ("mingw32", abi::OsWindows), ("win32", abi::OsWindows), + ("windows", abi::OsWindows), ("darwin", abi::OsMacos), ("android", abi::OsAndroid), ("linux", abi::OsLinux), diff --git a/src/librustdoc/plugins.rs b/src/librustdoc/plugins.rs index 9ac366655636c..c5ac9416fa06d 100644 --- a/src/librustdoc/plugins.rs +++ b/src/librustdoc/plugins.rs @@ -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 { n.push_str(".dll"); n @@ -85,7 +86,8 @@ fn libname(mut n: String) -> String { 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 { let mut i = String::from_str("lib"); i.push_str(n.as_slice()); diff --git a/src/librustrt/args.rs b/src/librustrt/args.rs index 531bbe038fcbb..453a9307579d4 100644 --- a/src/librustrt/args.rs +++ b/src/librustrt/args.rs @@ -147,7 +147,8 @@ mod imp { #[cfg(target_os = "macos")] #[cfg(target_os = "ios")] -#[cfg(target_os = "win32")] +#[cfg(target_os = "windows")] +#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot mod imp { use core::prelude::*; use collections::vec::Vec; diff --git a/src/librustrt/libunwind.rs b/src/librustrt/libunwind.rs index db6308c10dcf2..72d78d84aa3e6 100644 --- a/src/librustrt/libunwind.rs +++ b/src/librustrt/libunwind.rs @@ -86,7 +86,8 @@ pub type _Unwind_Exception_Cleanup_Fn = #[cfg(target_os = "linux")] #[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")] extern {} diff --git a/src/librustrt/stack.rs b/src/librustrt/stack.rs index c941107d7e81a..772b5da8cd5b8 100644 --- a/src/librustrt/stack.rs +++ b/src/librustrt/stack.rs @@ -199,7 +199,8 @@ pub unsafe fn record_sp_limit(limit: uint) { unsafe fn target_record_sp_limit(limit: uint) { 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) { // see: http://en.wikipedia.org/wiki/Win32_Thread_Information_Block // 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) { 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) { // see: http://en.wikipedia.org/wiki/Win32_Thread_Information_Block // 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"); 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 { let limit; 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"); 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 { let limit; asm!("movl %fs:0x14, $0" : "=r"(limit) ::: "volatile"); diff --git a/src/librustuv/uvll.rs b/src/librustuv/uvll.rs index 2bcd2101d890b..81114dccb62ea 100644 --- a/src/librustuv/uvll.rs +++ b/src/librustuv/uvll.rs @@ -723,7 +723,8 @@ extern {} #[link(name = "rt")] extern {} -#[cfg(target_os = "win32")] +#[cfg(target_os = "windows")] +#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot #[link(name = "ws2_32")] #[link(name = "psapi")] #[link(name = "iphlpapi")] diff --git a/src/libstd/dynamic_lib.rs b/src/libstd/dynamic_lib.rs index 1ac37458e2493..c1e8fd8832a9f 100644 --- a/src/libstd/dynamic_lib.rs +++ b/src/libstd/dynamic_lib.rs @@ -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 { use c_str::ToCStr; use iter::Iterator; diff --git a/src/libstd/os.rs b/src/libstd/os.rs index 85445e4913935..7a3991b569674 100644 --- a/src/libstd/os.rs +++ b/src/libstd/os.rs @@ -1842,7 +1842,8 @@ pub mod consts { 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 use os::arch_consts::ARCH; @@ -1850,7 +1851,7 @@ pub mod consts { /// A string describing the specific operating system in use: in this /// case, `win32`. - pub static SYSNAME: &'static str = "win32"; + pub static SYSNAME: &'static str = "windows"; /// Specifies the filename prefix used for shared libraries on this /// platform: in this case, the empty string. diff --git a/src/libsyntax/abi.rs b/src/libsyntax/abi.rs index 77b0f91f33b67..3280829f95835 100644 --- a/src/libsyntax/abi.rs +++ b/src/libsyntax/abi.rs @@ -147,7 +147,7 @@ impl fmt::Show for Os { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { match *self { OsLinux => "linux".fmt(f), - OsWindows => "win32".fmt(f), + OsWindows => "windows".fmt(f), OsMacos => "macos".fmt(f), OsiOS => "ios".fmt(f), OsAndroid => "android".fmt(f), diff --git a/src/test/run-pass/dupe-first-attr.rc b/src/test/run-pass/dupe-first-attr.rc index 76dedaba40f0b..cb99f90bea8ef 100644 --- a/src/test/run-pass/dupe-first-attr.rc +++ b/src/test/run-pass/dupe-first-attr.rc @@ -17,7 +17,8 @@ mod hello; #[cfg(target_os = "macos")] mod hello; -#[cfg(target_os = "win32")] +#[cfg(target_os = "windows")] +#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot mod hello; #[cfg(target_os = "freebsd")] diff --git a/src/test/run-pass/intrinsic-alignment.rs b/src/test/run-pass/intrinsic-alignment.rs index edf5068184aea..f8110ad79754e 100644 --- a/src/test/run-pass/intrinsic-alignment.rs +++ b/src/test/run-pass/intrinsic-alignment.rs @@ -42,7 +42,8 @@ mod m { } } -#[cfg(target_os = "win32")] +#[cfg(target_os = "windows")] +#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot mod m { #[main] #[cfg(target_arch = "x86")] diff --git a/src/test/run-pass/rec-align-u64.rs b/src/test/run-pass/rec-align-u64.rs index 5c484dec445b1..f9a496feb6c08 100644 --- a/src/test/run-pass/rec-align-u64.rs +++ b/src/test/run-pass/rec-align-u64.rs @@ -55,7 +55,8 @@ mod m { } } -#[cfg(target_os = "win32")] +#[cfg(target_os = "windows")] +#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot mod m { #[cfg(target_arch = "x86")] pub mod m { From 1b2dc760aff713c707e3d39285ad6901585c9290 Mon Sep 17 00:00:00 2001 From: Vadim Chugunov Date: Mon, 11 Aug 2014 16:24:19 -0700 Subject: [PATCH 3/4] Replace "ignore-win32" in tests with "ignore-windows" --- src/test/bench/shootout-regex-dna.rs | 2 +- .../compile-fail-fulldeps/syntax-extension-regex-invalid.rs | 2 +- .../syntax-extension-regex-unused-static.rs | 2 +- src/test/compile-fail-fulldeps/syntax-extension-regex-unused.rs | 2 +- src/test/debuginfo/basic-types-globals-metadata.rs | 2 +- src/test/debuginfo/basic-types-globals.rs | 2 +- src/test/debuginfo/basic-types-mut-globals.rs | 2 +- src/test/debuginfo/c-style-enum.rs | 2 +- src/test/debuginfo/lexical-scopes-in-block-expression.rs | 2 +- src/test/debuginfo/simple-struct.rs | 2 +- src/test/debuginfo/simple-tuple.rs | 2 +- src/test/debuginfo/vec-slices.rs | 2 +- src/test/debuginfo/vec.rs | 2 +- src/test/run-pass/backtrace.rs | 2 +- src/test/run-pass/glob-std.rs | 2 +- src/test/run-pass/issue-14393.rs | 2 +- src/test/run-pass/issue-15487.rs | 2 +- src/test/run-pass/lang-item-public.rs | 2 +- src/test/run-pass/linkage-visibility.rs | 2 +- src/test/run-pass/linkage1.rs | 2 +- src/test/run-pass/logging-only-prints-once.rs | 2 +- src/test/run-pass/logging-separate-lines.rs | 2 +- src/test/run-pass/process-detach.rs | 2 +- src/test/run-pass/signal-exit-status.rs | 2 +- src/test/run-pass/spawning-with-debug.rs | 2 +- src/test/run-pass/tempfile.rs | 2 +- src/test/run-pass/test-runner-hides-main.rs | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/test/bench/shootout-regex-dna.rs b/src/test/bench/shootout-regex-dna.rs index 8908b5b87ed3c..606f075d96db4 100644 --- a/src/test/bench/shootout-regex-dna.rs +++ b/src/test/bench/shootout-regex-dna.rs @@ -39,7 +39,7 @@ // OF THE POSSIBILITY OF SUCH DAMAGE. // FIXME(#13725) windows needs fixing. -// ignore-win32 +// ignore-windows // ignore-stage1 // ignore-cross-compile #12102 diff --git a/src/test/compile-fail-fulldeps/syntax-extension-regex-invalid.rs b/src/test/compile-fail-fulldeps/syntax-extension-regex-invalid.rs index bccba74e05c70..64ef1abe7de90 100644 --- a/src/test/compile-fail-fulldeps/syntax-extension-regex-invalid.rs +++ b/src/test/compile-fail-fulldeps/syntax-extension-regex-invalid.rs @@ -9,7 +9,7 @@ // except according to those terms. // FIXME(#13725) windows needs fixing. -// ignore-win32 +// ignore-windows // ignore-stage1 #![feature(phase)] diff --git a/src/test/compile-fail-fulldeps/syntax-extension-regex-unused-static.rs b/src/test/compile-fail-fulldeps/syntax-extension-regex-unused-static.rs index 819c9e6b0fe2f..8d859c3f7ba2e 100644 --- a/src/test/compile-fail-fulldeps/syntax-extension-regex-unused-static.rs +++ b/src/test/compile-fail-fulldeps/syntax-extension-regex-unused-static.rs @@ -9,7 +9,7 @@ // except according to those terms. // FIXME(#13725) windows needs fixing. -// ignore-win32 +// ignore-windows // ignore-stage1 #![feature(phase)] diff --git a/src/test/compile-fail-fulldeps/syntax-extension-regex-unused.rs b/src/test/compile-fail-fulldeps/syntax-extension-regex-unused.rs index d96b3f6f224cf..304ad7423b1b2 100644 --- a/src/test/compile-fail-fulldeps/syntax-extension-regex-unused.rs +++ b/src/test/compile-fail-fulldeps/syntax-extension-regex-unused.rs @@ -9,7 +9,7 @@ // except according to those terms. // FIXME(#13725) windows needs fixing. -// ignore-win32 +// ignore-windows // ignore-stage1 #![feature(phase)] diff --git a/src/test/debuginfo/basic-types-globals-metadata.rs b/src/test/debuginfo/basic-types-globals-metadata.rs index 1e157f10c12a5..8621ce2a47ecb 100644 --- a/src/test/debuginfo/basic-types-globals-metadata.rs +++ b/src/test/debuginfo/basic-types-globals-metadata.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-win32: FIXME #13256 +// ignore-windows: FIXME #13256 // ignore-android: FIXME(#10381) // compile-flags:-g diff --git a/src/test/debuginfo/basic-types-globals.rs b/src/test/debuginfo/basic-types-globals.rs index 2fc20bedc0747..c7e43ae2d98ac 100644 --- a/src/test/debuginfo/basic-types-globals.rs +++ b/src/test/debuginfo/basic-types-globals.rs @@ -14,7 +14,7 @@ // about UTF-32 character encoding and will print a rust char as only // its numerical value. -// ignore-win32: FIXME #13256 +// ignore-windows: FIXME #13256 // ignore-android: FIXME(#10381) // compile-flags:-g diff --git a/src/test/debuginfo/basic-types-mut-globals.rs b/src/test/debuginfo/basic-types-mut-globals.rs index f1579192b17b2..392963b216caf 100644 --- a/src/test/debuginfo/basic-types-mut-globals.rs +++ b/src/test/debuginfo/basic-types-mut-globals.rs @@ -14,7 +14,7 @@ // about UTF-32 character encoding and will print a rust char as only // its numerical value. -// ignore-win32: FIXME #13256 +// ignore-windows: FIXME #13256 // ignore-android: FIXME(#10381) // compile-flags:-g diff --git a/src/test/debuginfo/c-style-enum.rs b/src/test/debuginfo/c-style-enum.rs index da30363f271d0..a81d42106f9e1 100644 --- a/src/test/debuginfo/c-style-enum.rs +++ b/src/test/debuginfo/c-style-enum.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-win32: FIXME #13256 +// ignore-windows: FIXME #13256 // ignore-android: FIXME(#10381) // compile-flags:-g diff --git a/src/test/debuginfo/lexical-scopes-in-block-expression.rs b/src/test/debuginfo/lexical-scopes-in-block-expression.rs index b5f9622e79a7b..c36642b3069d0 100644 --- a/src/test/debuginfo/lexical-scopes-in-block-expression.rs +++ b/src/test/debuginfo/lexical-scopes-in-block-expression.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-win32: FIXME #13256 +// ignore-windows: FIXME #13256 // ignore-android: FIXME(#10381) // compile-flags:-g diff --git a/src/test/debuginfo/simple-struct.rs b/src/test/debuginfo/simple-struct.rs index 5076673c3a512..dddd00dfbc5a8 100644 --- a/src/test/debuginfo/simple-struct.rs +++ b/src/test/debuginfo/simple-struct.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-win32: FIXME #13256 +// ignore-windows: FIXME #13256 // ignore-android: FIXME(#10381) // compile-flags:-g diff --git a/src/test/debuginfo/simple-tuple.rs b/src/test/debuginfo/simple-tuple.rs index 29d739d7f183a..47b4f2cd2a2f4 100644 --- a/src/test/debuginfo/simple-tuple.rs +++ b/src/test/debuginfo/simple-tuple.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-win32: FIXME #13256 +// ignore-windows: FIXME #13256 // ignore-android: FIXME(#10381) // compile-flags:-g diff --git a/src/test/debuginfo/vec-slices.rs b/src/test/debuginfo/vec-slices.rs index 00398fd5c8234..ba8c4d249ce7f 100644 --- a/src/test/debuginfo/vec-slices.rs +++ b/src/test/debuginfo/vec-slices.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-win32: FIXME #13256 +// ignore-windows: FIXME #13256 // ignore-android: FIXME(#10381) // compile-flags:-g diff --git a/src/test/debuginfo/vec.rs b/src/test/debuginfo/vec.rs index 7372a6e7ca019..00a4cb5430978 100644 --- a/src/test/debuginfo/vec.rs +++ b/src/test/debuginfo/vec.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-win32: FIXME #13256 +// ignore-windows: FIXME #13256 // ignore-android: FIXME(#10381) // compile-flags:-g diff --git a/src/test/run-pass/backtrace.rs b/src/test/run-pass/backtrace.rs index 0e4be12aa456d..f487a1c6be5ce 100644 --- a/src/test/run-pass/backtrace.rs +++ b/src/test/run-pass/backtrace.rs @@ -9,7 +9,7 @@ // except according to those terms. // no-pretty-expanded FIXME #15189 -// ignore-win32 FIXME #13259 +// ignore-windows FIXME #13259 extern crate native; use std::os; diff --git a/src/test/run-pass/glob-std.rs b/src/test/run-pass/glob-std.rs index 26b575c4b07ff..2ed6b82cad232 100644 --- a/src/test/run-pass/glob-std.rs +++ b/src/test/run-pass/glob-std.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // 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)] diff --git a/src/test/run-pass/issue-14393.rs b/src/test/run-pass/issue-14393.rs index 87108294ff362..99af544e7865b 100644 --- a/src/test/run-pass/issue-14393.rs +++ b/src/test/run-pass/issue-14393.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-win32: FIXME #13793 +// ignore-windows: FIXME #13793 fn main() { match ("", 1u) { diff --git a/src/test/run-pass/issue-15487.rs b/src/test/run-pass/issue-15487.rs index ee7595819bff0..cc5db0af88bea 100644 --- a/src/test/run-pass/issue-15487.rs +++ b/src/test/run-pass/issue-15487.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-win32 +// ignore-windows #![feature(link_args)] diff --git a/src/test/run-pass/lang-item-public.rs b/src/test/run-pass/lang-item-public.rs index f541ca6794f62..f12c66ae7db32 100644 --- a/src/test/run-pass/lang-item-public.rs +++ b/src/test/run-pass/lang-item-public.rs @@ -10,7 +10,7 @@ // aux-build:lang-item-public.rs // ignore-android -// ignore-win32 #13361 +// ignore-windows #13361 #![no_std] diff --git a/src/test/run-pass/linkage-visibility.rs b/src/test/run-pass/linkage-visibility.rs index 58f66314e4430..5e9e252cefa51 100644 --- a/src/test/run-pass/linkage-visibility.rs +++ b/src/test/run-pass/linkage-visibility.rs @@ -10,7 +10,7 @@ // aux-build:linkage-visibility.rs // 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"; diff --git a/src/test/run-pass/linkage1.rs b/src/test/run-pass/linkage1.rs index 2ab1e911180f0..ace7129919196 100644 --- a/src/test/run-pass/linkage1.rs +++ b/src/test/run-pass/linkage1.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-win32 +// ignore-windows // ignore-android // ignore-macos // aux-build:linkage1.rs diff --git a/src/test/run-pass/logging-only-prints-once.rs b/src/test/run-pass/logging-only-prints-once.rs index 396b633b63313..c1f7e569feb40 100644 --- a/src/test/run-pass/logging-only-prints-once.rs +++ b/src/test/run-pass/logging-only-prints-once.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-win32 +// ignore-windows // exec-env:RUST_LOG=debug use std::cell::Cell; diff --git a/src/test/run-pass/logging-separate-lines.rs b/src/test/run-pass/logging-separate-lines.rs index ad7ba02970f05..ebbe7fa65cdf8 100644 --- a/src/test/run-pass/logging-separate-lines.rs +++ b/src/test/run-pass/logging-separate-lines.rs @@ -9,7 +9,7 @@ // except according to those terms. // ignore-android -// ignore-win32 +// ignore-windows // exec-env:RUST_LOG=debug #![feature(phase)] diff --git a/src/test/run-pass/process-detach.rs b/src/test/run-pass/process-detach.rs index 69ff9fca6ceb9..9d6cab42b5c90 100644 --- a/src/test/run-pass/process-detach.rs +++ b/src/test/run-pass/process-detach.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-win32 +// ignore-windows // ignore-android // This test ensures that the 'detach' field on processes does the right thing. diff --git a/src/test/run-pass/signal-exit-status.rs b/src/test/run-pass/signal-exit-status.rs index c28e128dd0527..ed7145412b0a0 100644 --- a/src/test/run-pass/signal-exit-status.rs +++ b/src/test/run-pass/signal-exit-status.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-win32 +// ignore-windows extern crate debug; diff --git a/src/test/run-pass/spawning-with-debug.rs b/src/test/run-pass/spawning-with-debug.rs index c8918fda9e79e..264662d7d8bb2 100644 --- a/src/test/run-pass/spawning-with-debug.rs +++ b/src/test/run-pass/spawning-with-debug.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-win32 +// ignore-windows // exec-env:RUST_LOG=debug // regression test for issue #10405, make sure we don't call println! too soon. diff --git a/src/test/run-pass/tempfile.rs b/src/test/run-pass/tempfile.rs index 4355bf4127fc4..9ecf5c3940a72 100644 --- a/src/test/run-pass/tempfile.rs +++ b/src/test/run-pass/tempfile.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // 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. // One might expect these tests to be located in that module, but sadly they diff --git a/src/test/run-pass/test-runner-hides-main.rs b/src/test/run-pass/test-runner-hides-main.rs index 05d5506f0a6b0..64b914a7438cd 100644 --- a/src/test/run-pass/test-runner-hides-main.rs +++ b/src/test/run-pass/test-runner-hides-main.rs @@ -9,7 +9,7 @@ // except according to those terms. // compile-flags:--test -// ignore-win32 #10872 +// ignore-windows #10872 // ignore-pretty: does not work well with `--test` // Building as a test runner means that a synthetic main will be run, From 88c27e099f94b26d19f9e266e728269d6a23c811 Mon Sep 17 00:00:00 2001 From: Vadim Chugunov Date: Thu, 14 Aug 2014 01:55:51 -0700 Subject: [PATCH 4/4] Make it pass the pretty-printer test. --- src/test/run-pass/dupe-first-attr.rc | 2 +- src/test/run-pass/intrinsic-alignment.rs | 2 +- src/test/run-pass/rec-align-u64.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/run-pass/dupe-first-attr.rc b/src/test/run-pass/dupe-first-attr.rc index cb99f90bea8ef..f987446c6ad43 100644 --- a/src/test/run-pass/dupe-first-attr.rc +++ b/src/test/run-pass/dupe-first-attr.rc @@ -18,7 +18,7 @@ mod hello; mod hello; #[cfg(target_os = "windows")] -#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot +/* NOTE: Remove after snapshot */#[cfg(stage0, target_os = "win32")] mod hello; #[cfg(target_os = "freebsd")] diff --git a/src/test/run-pass/intrinsic-alignment.rs b/src/test/run-pass/intrinsic-alignment.rs index f8110ad79754e..5d0a3c085b4f0 100644 --- a/src/test/run-pass/intrinsic-alignment.rs +++ b/src/test/run-pass/intrinsic-alignment.rs @@ -43,7 +43,7 @@ mod m { } #[cfg(target_os = "windows")] -#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot +/* NOTE: Remove after snapshot */#[cfg(stage0, target_os = "win32")] mod m { #[main] #[cfg(target_arch = "x86")] diff --git a/src/test/run-pass/rec-align-u64.rs b/src/test/run-pass/rec-align-u64.rs index f9a496feb6c08..3a4f877012278 100644 --- a/src/test/run-pass/rec-align-u64.rs +++ b/src/test/run-pass/rec-align-u64.rs @@ -56,7 +56,7 @@ mod m { } #[cfg(target_os = "windows")] -#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot +/* NOTE: Remove after snapshot */#[cfg(stage0, target_os = "win32")] mod m { #[cfg(target_arch = "x86")] pub mod m {