about summary refs log tree commit diff
path: root/src/liballoc/lib.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-03-13 17:49:15 +0000
committerbors <bors@rust-lang.org>2015-03-13 17:49:15 +0000
commit9eb69abad8ffbce840e7dc7038ddea434dc987f1 (patch)
tree217b64e9e1271d2be83dfb091044432928861520 /src/liballoc/lib.rs
parentee7696383f3423cdd17373ff9e75c01acd8e3417 (diff)
parent40b64645fecbee4e11da1ea4328c1b1ab4b9b8a0 (diff)
downloadrust-9eb69abad8ffbce840e7dc7038ddea434dc987f1.tar.gz
rust-9eb69abad8ffbce840e7dc7038ddea434dc987f1.zip
Auto merge of #23337 - Manishearth:rollup, r=Manishearth
r? @Manishearth
Diffstat (limited to 'src/liballoc/lib.rs')
-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 5c9a42a8a71..34c0686fe37 100644
--- a/src/liballoc/lib.rs
+++ b/src/liballoc/lib.rs
@@ -69,6 +69,7 @@
 
 #![feature(no_std)]
 #![no_std]
+#![feature(allocator)]
 #![feature(lang_items, unsafe_destructor)]
 #![feature(box_syntax)]
 #![feature(optin_builtin_traits)]