Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions src/libcore/cell.rs
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,7 @@ impl<'b, T> DerefMut<T> for RefMut<'b, T> {
#[cfg(test)]
mod test {
use super::*;
use mem::drop;

#[test]
fn smoketest_cell() {
Expand Down Expand Up @@ -412,6 +413,22 @@ mod test {
assert!(format!("{}", x).as_slice().contains(x.get()));
}

#[test]
fn ref_and_refmut_have_sensible_show() {
use str::StrSlice;
use realstd::str::Str;

let refcell = RefCell::new("foo");

let refcell_refmut = refcell.borrow_mut();
assert!(format!("{}", refcell_refmut).as_slice().contains("foo"));
drop(refcell_refmut);

let refcell_ref = refcell.borrow();
assert!(format!("{}", refcell_ref).as_slice().contains("foo"));
drop(refcell_ref);
}

#[test]
fn double_imm_borrow() {
let x = RefCell::new(0);
Expand Down
15 changes: 14 additions & 1 deletion src/libcore/fmt/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,14 @@
#![allow(unused_variable)]

use any;
use cell::Cell;
use cell::{Cell, Ref, RefMut};
use char::Char;
use collections::Collection;
use iter::{Iterator, range};
use kinds::Copy;
use mem;
use option::{Option, Some, None};
use ops::Deref;
use result::{Ok, Err};
use result;
use slice::{Vector, ImmutableVector};
Expand Down Expand Up @@ -849,5 +850,17 @@ impl<T: Copy + Show> Show for Cell<T> {
}
}

impl<'b, T: Show> Show for Ref<'b, T> {
fn fmt(&self, f: &mut Formatter) -> Result {
(**self).fmt(f)
}
}

impl<'b, T: Show> Show for RefMut<'b, T> {
fn fmt(&self, f: &mut Formatter) -> Result {
(*(self.deref())).fmt(f)
}
}

// If you expected tests to be here, look instead at the run-pass/ifmt.rs test,
// it's a lot easier than creating all of the rt::Piece structures here.