diff options
| author | bors <bors@rust-lang.org> | 2013-10-23 15:11:07 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-10-23 15:11:07 -0700 |
| commit | e2428b791c5a4074ca712ab3b145ee05c2d67ead (patch) | |
| tree | f87ad60370397087291814d6afeac68b8da23f58 /src/libstd | |
| parent | 860cb81b59fb927443e52b5d9c2e29cfbf3dc2f6 (diff) | |
| parent | 142672dca4314e9cfebf067d46c3b542c721cff6 (diff) | |
| download | rust-e2428b791c5a4074ca712ab3b145ee05c2d67ead.tar.gz rust-e2428b791c5a4074ca712ab3b145ee05c2d67ead.zip | |
auto merge of #10032 : thestinger/rust/snapshot, r=huonw
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/std.rs | 2 | ||||
| -rw-r--r-- | src/libstd/unstable/intrinsics.rs | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/src/libstd/std.rs b/src/libstd/std.rs index c27609a590a..8c72e083f88 100644 --- a/src/libstd/std.rs +++ b/src/libstd/std.rs @@ -61,7 +61,7 @@ they contained the following prologue: html_favicon_url = "http://www.rust-lang.org/favicon.ico", html_root_url = "http://static.rust-lang.org/doc/master")]; -#[feature(macro_rules, globs, asm)]; +#[feature(macro_rules, globs, asm, managed_boxes)]; // Don't link to std. We are std. #[no_std]; diff --git a/src/libstd/unstable/intrinsics.rs b/src/libstd/unstable/intrinsics.rs index ee44bf4d996..1900d9d5801 100644 --- a/src/libstd/unstable/intrinsics.rs +++ b/src/libstd/unstable/intrinsics.rs @@ -410,9 +410,7 @@ extern "rust-intrinsic" { pub fn fabsf32(x: f32) -> f32; pub fn fabsf64(x: f64) -> f64; - #[cfg(not(stage0))] pub fn copysignf32(x: f32, y: f32) -> f32; - #[cfg(not(stage0))] pub fn copysignf64(x: f64, y: f64) -> f64; pub fn floorf32(x: f32) -> f32; @@ -424,19 +422,13 @@ extern "rust-intrinsic" { pub fn truncf32(x: f32) -> f32; pub fn truncf64(x: f64) -> f64; - #[cfg(not(stage0))] pub fn rintf32(x: f32) -> f32; - #[cfg(not(stage0))] pub fn rintf64(x: f64) -> f64; - #[cfg(not(stage0))] pub fn nearbyintf32(x: f32) -> f32; - #[cfg(not(stage0))] pub fn nearbyintf64(x: f64) -> f64; - #[cfg(not(stage0))] pub fn roundf32(x: f32) -> f32; - #[cfg(not(stage0))] pub fn roundf64(x: f64) -> f64; pub fn ctpop8(x: i8) -> i8; |