about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-09-22 01:12:26 +0000
committerbors <bors@rust-lang.org>2015-09-22 01:12:26 +0000
commite9d2587766a30d30491ec96dab5cc5d741ae043a (patch)
tree3c4f5ef22230bb3f67652a0e287a77b7aa39a0d8 /src/liballoc
parentf93ab64d4a1a7ee91759a1594ab2a426b6cc657e (diff)
parentb44cb01bd73b32ffe046b4dcfa549a954d139ab2 (diff)
downloadrust-e9d2587766a30d30491ec96dab5cc5d741ae043a.tar.gz
rust-e9d2587766a30d30491ec96dab5cc5d741ae043a.zip
Auto merge of #28364 - petrochenkov:usegate, r=alexcrichton
Closes https://github.com/rust-lang/rust/issues/28075
Closes https://github.com/rust-lang/rust/issues/28388

r? @eddyb 
cc @brson 
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/lib.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs
index 1beb015364d..66de5d7bea8 100644
--- a/src/liballoc/lib.rs
+++ b/src/liballoc/lib.rs
@@ -100,7 +100,7 @@
 #![cfg_attr(stage0, feature(alloc_system))]
 #![cfg_attr(not(stage0), feature(needs_allocator))]
 
-#![cfg_attr(test, feature(test, rustc_private))]
+#![cfg_attr(test, feature(test, rustc_private, box_heap))]
 
 #[cfg(stage0)]
 extern crate alloc_system;