]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #14053 : FlaPer87/rust/master, r=huonw
authorbors <bors@rust-lang.org>
Fri, 9 May 2014 16:11:35 +0000 (09:11 -0700)
committerbors <bors@rust-lang.org>
Fri, 9 May 2014 16:11:35 +0000 (09:11 -0700)
This patch allows for using derivings for `kinds` in libcore

r? @alexcrichton

1  2 
src/libcore/lib.rs

diff --combined src/libcore/lib.rs
index a771f30dfd197aabab3ea2d22c4d1304c9792b90,f32e87df5eccbb8294bfdd9a0524dcdc63ef2c09..38bce7a4741bf9ae7c38c969e2288f85255b625c
@@@ -106,11 -106,10 +106,12 @@@ 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!()
      #[cfg(test)] pub use realstd::option; // needed for assert!()
      #[cfg(test)] pub use realstd::os;     // needed for tests
 +    #[cfg(test)] pub use realstd::slice;  // needed for tests
 +    #[cfg(test)] pub use realstd::vec;    // needed for vec![]
  }