about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2014-04-30 20:13:05 -0700
committerAlex Crichton <alex@alexcrichton.com>2014-05-07 08:12:48 -0700
commitdca8a0d6e4d1848ead898b3fa5b1e6c940c85b87 (patch)
tree219fe4ec5952f3b07227852529c0007285dcdd14
parent5b75e44fb01f0eda10ce8d8df92b80945d894768 (diff)
core: Inherit the mem module
-rw-r--r--src/libcore/lib.rs1
-rw-r--r--src/libcore/mem.rs (renamed from src/libstd/mem.rs)2
-rw-r--r--src/libstd/lib.rs3
3 files changed, 2 insertions, 4 deletions
diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs
index b76d3b84254..a0cadd6fc72 100644
--- a/src/libcore/lib.rs
+++ b/src/libcore/lib.rs
@@ -24,3 +24,4 @@
 /* Core modules for ownership management */
 
 pub mod intrinsics;
+pub mod mem;
diff --git a/src/libstd/mem.rs b/src/libcore/mem.rs
index d216d91b901..860304232d4 100644
--- a/src/libstd/mem.rs
+++ b/src/libcore/mem.rs
@@ -13,8 +13,6 @@
 //! This module contains functions for querying the size and alignment of
 //! types, initializing and manipulating memory.
 
-#![allow(missing_doc)] // FIXME
-
 use cast;
 use ptr;
 use intrinsics;
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 2c971542960..9ef657f6e4a 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -134,6 +134,7 @@ extern crate core;
 #[cfg(test)] pub use owned = realstd::owned;
 
 pub use core::intrinsics;
+pub use core::mem;
 
 // Run tests with libgreen instead of libnative.
 //
@@ -243,8 +244,6 @@ pub mod path;
 pub mod cast;
 pub mod fmt;
 pub mod cleanup;
-pub mod mem;
-
 
 /* Unsupported interfaces */