From ec8a805b6dafc78e692b0a0f8de1a56c5f0dcc0f Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Wed, 30 Apr 2014 20:22:55 -0700
Subject: [PATCH] core: Inherit the kinds module

---
 src/{libstd => libcore}/kinds.rs | 0
 src/libcore/lib.rs               | 4 ++++
 src/libstd/lib.rs                | 3 ++-
 3 files changed, 6 insertions(+), 1 deletion(-)
 rename src/{libstd => libcore}/kinds.rs (100%)

diff --git a/src/libstd/kinds.rs b/src/libcore/kinds.rs
similarity index 100%
rename from src/libstd/kinds.rs
rename to src/libcore/kinds.rs
diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs
index 4f215793a38..630f84f6579 100644
--- a/src/libcore/lib.rs
+++ b/src/libcore/lib.rs
@@ -27,3 +27,7 @@ pub mod cast;
 pub mod intrinsics;
 pub mod mem;
 pub mod ptr;
+
+/* Core language traits */
+
+pub mod kinds;
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 066886ba382..350bb4bbaec 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -133,6 +133,8 @@ extern crate core;
 #[cfg(test)] pub use ty = realstd::ty;
 #[cfg(test)] pub use owned = realstd::owned;
 
+#[cfg(not(test))] pub use kinds = core::kinds;
+
 pub use core::cast;
 pub use core::intrinsics;
 pub use core::mem;
@@ -202,7 +204,6 @@ pub mod gc;
 
 /* Core language traits */
 
-#[cfg(not(test))] pub mod kinds;
 #[cfg(not(test))] pub mod ops;
 #[cfg(not(test))] pub mod cmp;
 #[cfg(not(test))] pub mod ty;