Skip to content

Commit 8c994a1

Browse files
vadimcnvadimcn
committed
Remove stage0 attributes.
1 parent 58bb603 commit 8c994a1

File tree

14 files changed

+4
-26
lines changed

14 files changed

+4
-26
lines changed

‎src/compiletest/runtest.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ use header;
1717
use procsrv;
1818
use util::logv;
1919
#[cfg(target_os = "windows")]
20-
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
2120
use util;
2221

2322
use std::io::File;
@@ -819,7 +818,6 @@ fn check_expected_errors(expected_errors: Vec<errors::ExpectedError> ,
819818
}).collect::<Vec<String> >();
820819

821820
#[cfg(target_os = "windows")]
822-
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
823821
fn to_lower( s : &str ) -> String {
824822
let i = s.chars();
825823
let c : Vec<char> = i.map( |c| {
@@ -833,7 +831,6 @@ fn check_expected_errors(expected_errors: Vec<errors::ExpectedError> ,
833831
}
834832

835833
#[cfg(target_os = "windows")]
836-
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
837834
fn prefix_matches( line : &str, prefix : &str ) -> bool {
838835
to_lower(line).as_slice().starts_with(to_lower(prefix).as_slice())
839836
}
@@ -1251,15 +1248,13 @@ fn make_cmdline(_libpath: &str, prog: &str, args: &[String]) -> String {
12511248
}
12521249

12531250
#[cfg(target_os = "windows")]
1254-
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
12551251
fn make_cmdline(libpath: &str, prog: &str, args: &[String]) -> String {
12561252
format!("{} {} {}", lib_path_cmd_prefix(libpath), prog, args.connect(" "))
12571253
}
12581254

12591255
// Build the LD_LIBRARY_PATH variable as it would be seen on the command line
12601256
// for diagnostic purposes
12611257
#[cfg(target_os = "windows")]
1262-
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
12631258
fn lib_path_cmd_prefix(path: &str) -> String {
12641259
format!("{}=\"{}\"", util::lib_path_env_var(), util::make_new_path(path))
12651260
}

‎src/compiletest/util.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
use common::Config;
1212

1313
#[cfg(target_os = "windows")]
14-
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
1514
use std::os::getenv;
1615

1716
/// Conversion table from triple OS name to Rust SYSNAME
@@ -36,7 +35,6 @@ pub fn get_os(triple: &str) -> &'static str {
3635
}
3736

3837
#[cfg(target_os = "windows")]
39-
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
4038
pub fn make_new_path(path: &str) -> String {
4139

4240
// 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 {
5048
}
5149

5250
#[cfg(target_os = "windows")]
53-
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
5451
pub fn lib_path_env_var() -> &'static str { "PATH" }
5552

5653
#[cfg(target_os = "windows")]
57-
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
5854
pub fn path_div() -> &'static str { ";" }
5955

6056
pub fn logv(config: &Config, s: String) {

‎src/etc/mklldeps.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ def run(args):
6868
]
6969

7070
f.write("#[cfg(" + ', '.join(cfg) + ")]\n")
71-
if os == "windows": # NOTE: Remove after snapshot
72-
f.write("#[cfg(stage0, target_arch = \"%s\", target_os = \"win32\")]\n" % (arch,))
7371

7472
version = run([llconfig, '--version']).strip()
7573

‎src/librustdoc/plugins.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ impl PluginManager {
7474
}
7575

7676
#[cfg(target_os = "windows")]
77-
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
7877
fn libname(mut n: String) -> String {
7978
n.push_str(".dll");
8079
n
@@ -86,8 +85,7 @@ fn libname(mut n: String) -> String {
8685
n
8786
}
8887

89-
#[cfg(not(stage0), not(target_os="windows"), not(target_os="macos"))]
90-
#[cfg(stage0, not(target_os="win32"), not(target_os="macos"))] // NOTE: Remove after snapshot
88+
#[cfg(not(target_os="windows"), not(target_os="macos"))]
9189
fn libname(n: String) -> String {
9290
let mut i = String::from_str("lib");
9391
i.push_str(n.as_slice());

‎src/librustrt/args.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@ mod imp {
148148
#[cfg(target_os = "macos")]
149149
#[cfg(target_os = "ios")]
150150
#[cfg(target_os = "windows")]
151-
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
152151
mod imp {
153152
use core::prelude::*;
154153
use collections::vec::Vec;

‎src/librustrt/libunwind.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ pub type _Unwind_Exception_Cleanup_Fn =
8888
#[cfg(target_os = "linux")]
8989
#[cfg(target_os = "freebsd")]
9090
#[cfg(target_os = "windows")]
91-
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
9291
#[link(name = "gcc_s")]
9392
extern {}
9493

‎src/librustrt/stack.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@ pub unsafe fn record_sp_limit(limit: uint) {
200200
asm!("movq $0, %fs:112" :: "r"(limit) :: "volatile")
201201
}
202202
#[cfg(target_arch = "x86_64", target_os = "windows")] #[inline(always)]
203-
#[cfg(stage0, target_arch = "x86_64", target_os = "win32")] // NOTE: Remove after snapshot
204203
unsafe fn target_record_sp_limit(limit: uint) {
205204
// see: http://en.wikipedia.org/wiki/Win32_Thread_Information_Block
206205
// store this inside of the "arbitrary data slot", but double the size
@@ -229,7 +228,6 @@ pub unsafe fn record_sp_limit(limit: uint) {
229228
asm!("movl $0, %gs:48" :: "r"(limit) :: "volatile")
230229
}
231230
#[cfg(target_arch = "x86", target_os = "windows")] #[inline(always)]
232-
#[cfg(stage0, target_arch = "x86", target_os = "win32")] // NOTE: Remove after snapshot
233231
unsafe fn target_record_sp_limit(limit: uint) {
234232
// see: http://en.wikipedia.org/wiki/Win32_Thread_Information_Block
235233
// store this inside of the "arbitrary data slot"
@@ -283,7 +281,6 @@ pub unsafe fn get_sp_limit() -> uint {
283281
return limit;
284282
}
285283
#[cfg(target_arch = "x86_64", target_os = "windows")] #[inline(always)]
286-
#[cfg(stage0, target_arch = "x86_64", target_os = "win32")] // NOTE: Remove after snapshot
287284
unsafe fn target_get_sp_limit() -> uint {
288285
let limit;
289286
asm!("movq %gs:0x28, $0" : "=r"(limit) ::: "volatile");
@@ -320,7 +317,6 @@ pub unsafe fn get_sp_limit() -> uint {
320317
return limit;
321318
}
322319
#[cfg(target_arch = "x86", target_os = "windows")] #[inline(always)]
323-
#[cfg(stage0, target_arch = "x86", target_os = "win32")] // NOTE: Remove after snapshot
324320
unsafe fn target_get_sp_limit() -> uint {
325321
let limit;
326322
asm!("movl %fs:0x14, $0" : "=r"(limit) ::: "volatile");

‎src/librustrt/unwind.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,8 +402,11 @@ pub mod eabi {
402402
use libunwind as uw;
403403
use libc::{c_void, c_int};
404404

405+
#[repr(C)]
405406
struct EXCEPTION_RECORD;
407+
#[repr(C)]
406408
struct CONTEXT;
409+
#[repr(C)]
407410
struct DISPATCHER_CONTEXT;
408411

409412
#[repr(C)]

‎src/librustuv/uvll.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,6 @@ extern {}
733733
extern {}
734734

735735
#[cfg(target_os = "windows")]
736-
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
737736
#[link(name = "ws2_32")]
738737
#[link(name = "psapi")]
739738
#[link(name = "iphlpapi")]

‎src/libstd/dynamic_lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,6 @@ pub mod dl {
279279
}
280280

281281
#[cfg(target_os = "windows")]
282-
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
283282
pub mod dl {
284283
use c_str::ToCStr;
285284
use iter::Iterator;

‎src/libstd/os.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1843,7 +1843,6 @@ pub mod consts {
18431843
}
18441844

18451845
#[cfg(target_os = "windows")]
1846-
#[cfg(stage0, target_os = "win32")] // NOTE: Remove after snapshot
18471846
pub mod consts {
18481847
pub use os::arch_consts::ARCH;
18491848

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ mod hello;
1818
mod hello;
1919

2020
#[cfg(target_os = "windows")]
21-
/* NOTE: Remove after snapshot */#[cfg(stage0, target_os = "win32")]
2221
mod hello;
2322

2423
#[cfg(target_os = "freebsd")]

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ mod m {
4343
}
4444

4545
#[cfg(target_os = "windows")]
46-
/* NOTE: Remove after snapshot */#[cfg(stage0, target_os = "win32")]
4746
mod m {
4847
#[main]
4948
#[cfg(target_arch = "x86")]

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ mod m {
5656
}
5757

5858
#[cfg(target_os = "windows")]
59-
/* NOTE: Remove after snapshot */#[cfg(stage0, target_os = "win32")]
6059
mod m {
6160
#[cfg(target_arch = "x86")]
6261
pub mod m {

0 commit comments

Comments
 (0)