about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2014-04-30 20:26:12 -0700
committerAlex Crichton <alex@alexcrichton.com>2014-05-07 08:13:24 -0700
commit2ad98fbb27edcc1170fde800219a107faac4ae44 (patch)
treef0eaa5daead69a8a5157f97d8c988679761c7cd3
parentead6e16a600526b6125ad482d5e17e1f900730ce (diff)
downloadrust-2ad98fbb27edcc1170fde800219a107faac4ae44.tar.gz
rust-2ad98fbb27edcc1170fde800219a107faac4ae44.zip
core: Inherit the ty module
-rw-r--r--src/libcore/lib.rs1
-rw-r--r--src/libcore/ty.rs (renamed from src/libstd/ty.rs)0
-rw-r--r--src/libstd/lib.rs3
3 files changed, 2 insertions, 2 deletions
diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs
index 42df97040f1..dd6b9e20d7a 100644
--- a/src/libcore/lib.rs
+++ b/src/libcore/lib.rs
@@ -32,3 +32,4 @@ pub mod ptr;
 
 pub mod kinds;
 pub mod ops;
+pub mod ty;
diff --git a/src/libstd/ty.rs b/src/libcore/ty.rs
index 0c9f0b02fdf..0c9f0b02fdf 100644
--- a/src/libstd/ty.rs
+++ b/src/libcore/ty.rs
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 0ef623a558f..eada05bf487 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -135,6 +135,7 @@ extern crate core;
 
 #[cfg(not(test))] pub use kinds = core::kinds;
 #[cfg(not(test))] pub use ops = core::ops;
+#[cfg(not(test))] pub use ty = core::ty;
 
 pub use core::cast;
 pub use core::intrinsics;
@@ -196,7 +197,6 @@ pub mod strbuf;
 
 pub mod ascii;
 
-pub mod owned;
 mod managed;
 mod reference;
 pub mod rc;
@@ -206,7 +206,6 @@ pub mod gc;
 /* Core language traits */
 
 #[cfg(not(test))] pub mod cmp;
-#[cfg(not(test))] pub mod ty;
 #[cfg(not(test))] pub mod owned;