about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-05-09 09:11:35 -0700
committerbors <bors@rust-lang.org>2014-05-09 09:11:35 -0700
commit58d540f0c6cdab817aba3705c9d4842b995ab4c9 (patch)
tree5888d61190cb2bed2a57c9ae745e3b03ceb0bc44
parent176df98a198ab67a5494bcca2f4e9f4979a7e2f9 (diff)
parentd90b4daac9cdd81fd68798a3f7c6190c30ecc41c (diff)
downloadrust-58d540f0c6cdab817aba3705c9d4842b995ab4c9.tar.gz
rust-58d540f0c6cdab817aba3705c9d4842b995ab4c9.zip
auto merge of #14053 : FlaPer87/rust/master, r=huonw
This patch allows for using derivings for `kinds` in libcore

r? @alexcrichton 
-rw-r--r--src/libcore/lib.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs
index a771f30dfd1..38bce7a4741 100644
--- a/src/libcore/lib.rs
+++ b/src/libcore/lib.rs
@@ -106,6 +106,7 @@ mod should_not_exist;
 mod std {
     pub use clone;
     pub use cmp;
+    pub use kinds;
 
     #[cfg(test)] pub use realstd::fmt;    // needed for fail!()
     #[cfg(test)] pub use realstd::rt;     // needed for fail!()