about summary refs log tree commit diff
path: root/src/liballoc/lib.rs
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-01-21 09:18:56 -0800
committerAlex Crichton <alex@alexcrichton.com>2015-01-21 09:18:56 -0800
commitefea645c94451efbb6ac4be29c6307b434057ff2 (patch)
tree244a8ba3e4756a1a8da1a54c86a0deb285341173 /src/liballoc/lib.rs
parent907db6c8344a4df070ee2b21479062a63c3ae2be (diff)
parentace2f09d3f89e20a7caa67bb0548212b07f696c2 (diff)
downloadrust-efea645c94451efbb6ac4be29c6307b434057ff2.tar.gz
rust-efea645c94451efbb6ac4be29c6307b434057ff2.zip
rollup merge of #21446: stepancheg/boxed-test
Conflicts:
	src/liballoc/boxed.rs
Diffstat (limited to 'src/liballoc/lib.rs')
-rw-r--r--src/liballoc/lib.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs
index 47715fe9e5d..231ef6e7e74 100644
--- a/src/liballoc/lib.rs
+++ b/src/liballoc/lib.rs
@@ -93,6 +93,8 @@ pub mod heap;
 
 #[cfg(not(test))]
 pub mod boxed;
+#[cfg(test)]
+mod boxed_test;
 pub mod arc;
 pub mod rc;