diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-12-11 13:07:11 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-12-21 09:26:21 -0800 |
| commit | cd1848a1a60f40f25019e455b1050efd69707604 (patch) | |
| tree | 951659efd37119d3e132e2f05225cf9b18060c86 /src/libstd | |
| parent | e2834a20e7c5bbfb1502f582545153dc6b25a70c (diff) | |
| download | rust-cd1848a1a60f40f25019e455b1050efd69707604.tar.gz rust-cd1848a1a60f40f25019e455b1050efd69707604.zip | |
Register new snapshots
Lots of cruft to remove!
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/lib.rs | 9 | ||||
| -rw-r--r-- | src/libstd/rand/os.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sys/common/libunwind.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sys/common/unwind/mod.rs | 12 | ||||
| -rw-r--r-- | src/libstd/sys/windows/c.rs | 2 |
5 files changed, 2 insertions, 25 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index eba0c799cd2..cc158eba3c2 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -199,11 +199,8 @@ //! [other]: #what-is-in-the-standard-library-documentation //! [primitive types]: ../book/primitive-types.html -// Do not remove on snapshot creation. Needed for bootstrap. (Issue #22364) -#![cfg_attr(stage0, feature(custom_attribute))] #![crate_name = "std"] #![stable(feature = "rust1", since = "1.0.0")] -#![cfg_attr(stage0, staged_api)] #![crate_type = "rlib"] #![crate_type = "dylib"] #![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png", @@ -214,12 +211,6 @@ test(no_crate_inject, attr(deny(warnings))), test(attr(allow(dead_code, deprecated, unused_variables, unused_mut))))] -#![cfg_attr(stage0, allow(unused_attributes))] -#![cfg_attr(stage0, allow(improper_ctypes))] - -#![cfg_attr(stage0, feature(rustc_attrs))] -#![cfg_attr(stage0, feature(no_std))] -#![cfg_attr(stage0, allow(unused_attributes))] #![feature(alloc)] #![feature(allow_internal_unstable)] #![feature(asm)] diff --git a/src/libstd/rand/os.rs b/src/libstd/rand/os.rs index 13965ce810d..c11212b3ae0 100644 --- a/src/libstd/rand/os.rs +++ b/src/libstd/rand/os.rs @@ -238,8 +238,6 @@ mod imp { #[cfg(target_os = "ios")] mod imp { - #[cfg(stage0)] use prelude::v1::*; - use io; use mem; use ptr; diff --git a/src/libstd/sys/common/libunwind.rs b/src/libstd/sys/common/libunwind.rs index 75bb11216e1..feb05c7b560 100644 --- a/src/libstd/sys/common/libunwind.rs +++ b/src/libstd/sys/common/libunwind.rs @@ -131,8 +131,6 @@ extern "C" { pub fn _Unwind_DeleteException(exception: *mut _Unwind_Exception); - // remove cfg after new snapshot - #[cfg(not(all(stage0, target_os="windows", target_arch="x86_64")))] #[unwind] pub fn _Unwind_Resume(exception: *mut _Unwind_Exception) -> !; } diff --git a/src/libstd/sys/common/unwind/mod.rs b/src/libstd/sys/common/unwind/mod.rs index aea5acc9071..0f10e727461 100644 --- a/src/libstd/sys/common/unwind/mod.rs +++ b/src/libstd/sys/common/unwind/mod.rs @@ -88,18 +88,8 @@ use sys_common::mutex::Mutex; #[path = "seh.rs"] #[doc(hidden)] pub mod imp; -// stage0: i686-pc-windows-gnu -#[cfg(all(stage0, windows, target_arch = "x86_64", target_env = "gnu"))] -#[path = "seh64_gnu.rs"] #[doc(hidden)] -pub mod imp; - -// stage0: x86_64-pc-windows-msvc -#[cfg(all(stage0, windows, target_arch = "x86_64", target_env = "msvc"))] -#[path = "seh.rs"] #[doc(hidden)] -pub mod imp; - // x86_64-pc-windows-* -#[cfg(all(not(stage0), windows, target_arch = "x86_64"))] +#[cfg(all(windows, target_arch = "x86_64"))] #[path = "seh64_gnu.rs"] #[doc(hidden)] pub mod imp; diff --git a/src/libstd/sys/windows/c.rs b/src/libstd/sys/windows/c.rs index 5e0368f35cc..34e32d0d5b6 100644 --- a/src/libstd/sys/windows/c.rs +++ b/src/libstd/sys/windows/c.rs @@ -17,7 +17,7 @@ use os::raw::{c_char, c_short, c_ulonglong}; use libc::{wchar_t, size_t, c_void}; use ptr; -#[cfg_attr(not(stage0), repr(simd))] +#[repr(simd)] #[repr(C)] struct u64x2(u64, u64); |
