summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-03-26 18:41:38 +0000
committerbors <bors@rust-lang.org>2018-03-26 18:41:38 +0000
commit188e693b392116c46f746e86f8521f9621fcfd43 (patch)
tree21205e49317c0c351e2ef53a584559a213e862b8 /src/liballoc
parentab8b961677ac5c74762dcea955aa0ff4d7fe4915 (diff)
parent140bf949bf65bb0479dbe31bd3474d5546ef59e1 (diff)
downloadrust-188e693b392116c46f746e86f8521f9621fcfd43.tar.gz
rust-188e693b392116c46f746e86f8521f9621fcfd43.zip
Auto merge of #49101 - mark-i-m:stabilize_i128, r=nagisa
Stabilize 128-bit integers :tada:

cc #35118

EDIT: This should be merged only after the following have been merged:
- [x] https://github.com/rust-lang-nursery/compiler-builtins/pull/236
- [x] https://github.com/rust-lang/book/pull/1230
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/benches/lib.rs2
-rw-r--r--src/liballoc/lib.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/liballoc/benches/lib.rs b/src/liballoc/benches/lib.rs
index 2de0ffb4b26..09685d1bb40 100644
--- a/src/liballoc/benches/lib.rs
+++ b/src/liballoc/benches/lib.rs
@@ -10,7 +10,7 @@
 
 #![deny(warnings)]
 
-#![feature(i128_type)]
+#![cfg_attr(stage0, feature(i128_type))]
 #![feature(rand)]
 #![feature(repr_simd)]
 #![feature(test)]
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs
index f914b1a93a9..19d64d8fea9 100644
--- a/src/liballoc/lib.rs
+++ b/src/liballoc/lib.rs
@@ -97,7 +97,7 @@
 #![feature(from_ref)]
 #![feature(fundamental)]
 #![feature(generic_param_attrs)]
-#![feature(i128_type)]
+#![cfg_attr(stage0, feature(i128_type))]
 #![feature(iter_rfold)]
 #![feature(lang_items)]
 #![feature(needs_allocator)]