about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2015-02-23 19:34:25 +0530
committerAlex Crichton <alex@alexcrichton.com>2015-02-23 11:43:59 -0800
commit8eb655b1e6235c7524aaedefaaae4a6e7bcbd508 (patch)
tree9e8112d3fcf255028dcf7a6b8f6c9dd32f23ee26 /src
parentf17a5220cb71c4f67476738fbbef803265505131 (diff)
downloadrust-8eb655b1e6235c7524aaedefaaae4a6e7bcbd508.tar.gz
rust-8eb655b1e6235c7524aaedefaaae4a6e7bcbd508.zip
import boxed for alloc/rc.rs (fixup #22696)
Diffstat (limited to 'src')
-rw-r--r--src/liballoc/rc.rs4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/liballoc/rc.rs b/src/liballoc/rc.rs
index 5b3d7c9ea90..f57286bbf11 100644
--- a/src/liballoc/rc.rs
+++ b/src/liballoc/rc.rs
@@ -143,8 +143,10 @@
 //! ```
 
 #![stable(feature = "rust1", since = "1.0.0")]
-
+#[cfg(not(test))]
 use boxed;
+#[cfg(test)]
+use std::boxed;
 use core::cell::Cell;
 use core::clone::Clone;
 use core::cmp::{PartialEq, PartialOrd, Eq, Ord, Ordering};