rollup merge of #21446: stepancheg/boxed-test

Conflicts:
	src/liballoc/boxed.rs
This commit is contained in:
Alex Crichton
2015-01-21 09:18:56 -08:00
3 changed files with 77 additions and 54 deletions

View File

@@ -93,6 +93,8 @@ pub mod heap;
#[cfg(not(test))]
pub mod boxed;
#[cfg(test)]
mod boxed_test;
pub mod arc;
pub mod rc;