about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-01-08 09:24:08 -0800
committerAlex Crichton <alex@alexcrichton.com>2015-01-08 09:24:08 -0800
commit4281bd1932bf185e1154f7a79832bbd2d9155e41 (patch)
tree27263299612651b57cb595a2cebf4830dc113904 /src/liballoc
parent8ed88c11af9495e7119da4ac59f329a33cedac59 (diff)
parenta661bd6575dd3fac17cf77fdea8b76ca790ac212 (diff)
downloadrust-4281bd1932bf185e1154f7a79832bbd2d9155e41.tar.gz
rust-4281bd1932bf185e1154f7a79832bbd2d9155e41.zip
rollup merge of #20754: nikomatsakis/int-feature
Conflicts:
	src/test/compile-fail/borrowck-move-out-of-overloaded-auto-deref.rs
	src/test/compile-fail/issue-2590.rs
	src/test/compile-fail/lint-stability.rs
	src/test/compile-fail/slice-mut-2.rs
	src/test/compile-fail/std-uncopyable-atomics.rs
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/lib.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs
index 916015539a0..4a85637625a 100644
--- a/src/liballoc/lib.rs
+++ b/src/liballoc/lib.rs
@@ -68,6 +68,7 @@
 #![allow(unknown_features)]
 #![feature(lang_items, unsafe_destructor)]
 #![feature(box_syntax)]
+#![allow(unknown_features)] #![feature(int_uint)]
 
 #[macro_use]
 extern crate core;