about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorStepan Koltsov <stepan.koltsov@gmail.com>2014-11-14 22:22:42 +0300
committerStepan Koltsov <stepan.koltsov@gmail.com>2014-11-14 22:22:42 +0300
commit7eae5b458993b8a030ed9bb6e65c12babc4bbe4b (patch)
tree866ebbfb319455358f74e8a89163c5d01fd5c9ce /src
parent1bf06495443584539b958873e04cc2f864ab10e4 (diff)
downloadrust-7eae5b458993b8a030ed9bb6e65c12babc4bbe4b.tar.gz
rust-7eae5b458993b8a030ed9bb6e65c12babc4bbe4b.zip
impl Default for Cell and RefCell
It is necessary to have #[deriving(Default)] for struct containing
cells like Cell<u32>.
Diffstat (limited to 'src')
-rw-r--r--src/libcore/cell.rs15
-rw-r--r--src/libcoretest/cell.rs13
2 files changed, 28 insertions, 0 deletions
diff --git a/src/libcore/cell.rs b/src/libcore/cell.rs
index 9d3fa9deed7..24f841acbe9 100644
--- a/src/libcore/cell.rs
+++ b/src/libcore/cell.rs
@@ -157,6 +157,7 @@
 
 use clone::Clone;
 use cmp::PartialEq;
+use default::Default;
 use kinds::{marker, Copy};
 use ops::{Deref, DerefMut, Drop};
 use option::{None, Option, Some};
@@ -211,6 +212,13 @@ impl<T:Copy> Clone for Cell<T> {
     }
 }
 
+#[unstable]
+impl<T:Default + Copy> Default for Cell<T> {
+    fn default() -> Cell<T> {
+        Cell::new(Default::default())
+    }
+}
+
 #[unstable = "waiting for `PartialEq` trait to become stable"]
 impl<T:PartialEq + Copy> PartialEq for Cell<T> {
     fn eq(&self, other: &Cell<T>) -> bool {
@@ -337,6 +345,13 @@ impl<T: Clone> Clone for RefCell<T> {
     }
 }
 
+#[unstable]
+impl<T:Default> Default for RefCell<T> {
+    fn default() -> RefCell<T> {
+        RefCell::new(Default::default())
+    }
+}
+
 #[unstable = "waiting for `PartialEq` to become stable"]
 impl<T: PartialEq> PartialEq for RefCell<T> {
     fn eq(&self, other: &RefCell<T>) -> bool {
diff --git a/src/libcoretest/cell.rs b/src/libcoretest/cell.rs
index 59365045f43..6444cf7ee0e 100644
--- a/src/libcoretest/cell.rs
+++ b/src/libcoretest/cell.rs
@@ -9,6 +9,7 @@
 // except according to those terms.
 
 use core::cell::*;
+use core::default::Default;
 use std::mem::drop;
 
 #[test]
@@ -146,3 +147,15 @@ fn as_unsafe_cell() {
     unsafe { *r2.as_unsafe_cell().get() = 1u; }
     assert_eq!(1u, *r2.borrow());
 }
+
+#[test]
+fn cell_default() {
+    let cell: Cell<u32> = Default::default();
+    assert_eq!(0, cell.get());
+}
+
+#[test]
+fn refcell_default() {
+    let cell: RefCell<u64> = Default::default();
+    assert_eq!(0, *cell.borrow());
+}