Remove stage0 attributes.

src/compiletest/runtest.rs

@@ -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))
 }

src/compiletest/util.rs

@@ -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) {

src/etc/mklldeps.py

@@ -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()
 

src/librustdoc/plugins.rs

@@ -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());

src/librustrt/args.rs

@@ -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;

src/librustrt/libunwind.rs

@@ -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 {}
 

src/librustrt/stack.rs

@@ -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");

src/librustrt/unwind.rs

@@ -402,8 +402,11 @@ pub mod eabi {
     use libunwind as uw;
     use libc::{c_void, c_int};
 
+    #[repr(C)]
     struct EXCEPTION_RECORD;
+    #[repr(C)]
     struct CONTEXT;
+    #[repr(C)]
     struct DISPATCHER_CONTEXT;
 
     #[repr(C)]

src/librustuv/uvll.rs

@@ -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")]

src/libstd/dynamic_lib.rs

@@ -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;

src/libstd/os.rs

@@ -1843,7 +1843,6 @@ 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;
 

src/test/run-pass/dupe-first-attr.rc

@@ -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")]

src/test/run-pass/intrinsic-alignment.rs

@@ -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")]

src/test/run-pass/rec-align-u64.rs

@@ -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 {