diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-05-01 11:19:56 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-05-07 08:16:14 -0700 |
| commit | f62c121eb0de35ac03a7860e6039202f2522e527 (patch) | |
| tree | ceabe832921580a94cc4892ec5c134f05dbadc43 | |
| parent | d4b5d82a3356630ede4ce1b436cb59760be7b703 (diff) | |
| download | rust-f62c121eb0de35ac03a7860e6039202f2522e527.tar.gz rust-f62c121eb0de35ac03a7860e6039202f2522e527.zip | |
core: Inherit the cell module
| -rw-r--r-- | src/libcore/cell.rs (renamed from src/libstd/cell.rs) | 7 | ||||
| -rw-r--r-- | src/libcore/lib.rs | 3 | ||||
| -rw-r--r-- | src/libstd/fmt/mod.rs | 2 | ||||
| -rw-r--r-- | src/libstd/lib.rs | 2 |
4 files changed, 5 insertions, 9 deletions
diff --git a/src/libstd/cell.rs b/src/libcore/cell.rs index 1e4faf1a899..8c520a4788a 100644 --- a/src/libstd/cell.rs +++ b/src/libcore/cell.rs @@ -12,7 +12,6 @@ use clone::Clone; use cmp::Eq; -use fmt; use kinds::{marker, Copy}; use ops::{Deref, DerefMut, Drop}; use option::{None, Option, Some}; @@ -60,12 +59,6 @@ impl<T:Eq + Copy> Eq for Cell<T> { } } -impl<T: Copy + fmt::Show> fmt::Show for Cell<T> { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!(f.buf, r"Cell \{ value: {} \}", self.get()) - } -} - /// A mutable memory location with dynamically checked borrow rules pub struct RefCell<T> { value: Unsafe<T>, diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs index a0938c83eca..550dcc1fed8 100644 --- a/src/libcore/lib.rs +++ b/src/libcore/lib.rs @@ -67,11 +67,12 @@ mod unicode; mod unit; pub mod any; pub mod bool; +pub mod cell; +pub mod char; pub mod finally; pub mod iter; pub mod option; pub mod raw; -pub mod char; pub mod result; pub mod slice; pub mod str; diff --git a/src/libstd/fmt/mod.rs b/src/libstd/fmt/mod.rs index 8cfc0ae54c3..74ab874d319 100644 --- a/src/libstd/fmt/mod.rs +++ b/src/libstd/fmt/mod.rs @@ -485,6 +485,7 @@ will look like `"\\{"`. use any; use cast; +use cell::Cell; use char::Char; use cmp; use container::Container; @@ -492,6 +493,7 @@ use io::MemWriter; use io; use iter; use iter::{Iterator, range}; +use kinds::Copy; use num::Signed; use option::{Option, Some, None}; use owned::Box; diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 95d67eb77d1..4a555035a08 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -141,6 +141,7 @@ extern crate core; pub use core::any; pub use core::bool; pub use core::cast; +pub use core::cell; pub use core::char; pub use core::clone; pub use core::container; @@ -220,7 +221,6 @@ pub mod hash; /* Common data structures */ pub mod result; -pub mod cell; /* Tasks and communication */ |