Skip to content

Commit ceac0ab

Browse files
committed
---
yaml --- r: 151411 b: refs/heads/try2 c: f62c121 h: refs/heads/master i: 151409: 09cf660 151407: bfc35d9 v: v3
1 parent eb9b08b commit ceac0ab

File tree

5 files changed

+6
-10
lines changed

5 files changed

+6
-10
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: d4b5d82a3356630ede4ce1b436cb59760be7b703
8+
refs/heads/try2: f62c121eb0de35ac03a7860e6039202f2522e527
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libstd/cell.rs renamed to branches/try2/src/libcore/cell.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
1313
use clone::Clone;
1414
use cmp::Eq;
15-
use fmt;
1615
use kinds::{marker, Copy};
1716
use ops::{Deref, DerefMut, Drop};
1817
use option::{None, Option, Some};
@@ -60,12 +59,6 @@ impl<T:Eq + Copy> Eq for Cell<T> {
6059
}
6160
}
6261

63-
impl<T: Copy + fmt::Show> fmt::Show for Cell<T> {
64-
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
65-
write!(f.buf, r"Cell \{ value: {} \}", self.get())
66-
}
67-
}
68-
6962
/// A mutable memory location with dynamically checked borrow rules
7063
pub struct RefCell<T> {
7164
value: Unsafe<T>,

branches/try2/src/libcore/lib.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,12 @@ mod unicode;
6767
mod unit;
6868
pub mod any;
6969
pub mod bool;
70+
pub mod cell;
71+
pub mod char;
7072
pub mod finally;
7173
pub mod iter;
7274
pub mod option;
7375
pub mod raw;
74-
pub mod char;
7576
pub mod result;
7677
pub mod slice;
7778
pub mod str;

branches/try2/src/libstd/fmt/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -485,13 +485,15 @@ will look like `"\\{"`.
485485

486486
use any;
487487
use cast;
488+
use cell::Cell;
488489
use char::Char;
489490
use cmp;
490491
use container::Container;
491492
use io::MemWriter;
492493
use io;
493494
use iter;
494495
use iter::{Iterator, range};
496+
use kinds::Copy;
495497
use num::Signed;
496498
use option::{Option, Some, None};
497499
use owned::Box;

branches/try2/src/libstd/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ extern crate core;
141141
pub use core::any;
142142
pub use core::bool;
143143
pub use core::cast;
144+
pub use core::cell;
144145
pub use core::char;
145146
pub use core::clone;
146147
pub use core::container;
@@ -220,7 +221,6 @@ pub mod hash;
220221
/* Common data structures */
221222

222223
pub mod result;
223-
pub mod cell;
224224

225225

226226
/* Tasks and communication */

0 commit comments

Comments
 (0)