diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-04-30 20:22:55 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-05-07 08:13:06 -0700 |
| commit | ec8a805b6dafc78e692b0a0f8de1a56c5f0dcc0f (patch) | |
| tree | 51b72f47bf2cf2f5920130a4b6f655d4100c6c3f | |
| parent | 28624661c3ab16331d134fdbbfb2fd10513e9411 (diff) | |
| download | rust-ec8a805b6dafc78e692b0a0f8de1a56c5f0dcc0f.tar.gz rust-ec8a805b6dafc78e692b0a0f8de1a56c5f0dcc0f.zip | |
core: Inherit the kinds module
| -rw-r--r-- | src/libcore/kinds.rs (renamed from src/libstd/kinds.rs) | 0 | ||||
| -rw-r--r-- | src/libcore/lib.rs | 4 | ||||
| -rw-r--r-- | src/libstd/lib.rs | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/src/libstd/kinds.rs b/src/libcore/kinds.rs index 6ef71d3360a..6ef71d3360a 100644 --- a/src/libstd/kinds.rs +++ b/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; |