From 7317ef5c362bde766440f62e6c2ac8a210e6c22d Mon Sep 17 00:00:00 2001 From: Keegan McAllister Date: Tue, 21 Oct 2014 12:59:21 -0700 Subject: [PATCH] Add as_unsafe_cell() for Cell and RefCell Fixes #18131. --- src/libcore/cell.rs | 22 ++++++++++++++++++++++ src/libcoretest/cell.rs | 19 +++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/src/libcore/cell.rs b/src/libcore/cell.rs index d644fd0063ed3..8a4b9f6e51b60 100644 --- a/src/libcore/cell.rs +++ b/src/libcore/cell.rs @@ -191,6 +191,17 @@ impl Cell { *self.value.get() = value; } } + + /// Get a reference to the underlying `UnsafeCell`. + /// + /// This can be used to circumvent `Cell`'s safety checks. + /// + /// This function is `unsafe` because `UnsafeCell`'s field is public. + #[inline] + #[experimental] + pub unsafe fn as_unsafe_cell<'a>(&'a self) -> &'a UnsafeCell { + &self.value + } } #[unstable = "waiting for `Clone` trait to become stable"] @@ -306,6 +317,17 @@ impl RefCell { None => fail!("RefCell already borrowed") } } + + /// Get a reference to the underlying `UnsafeCell`. + /// + /// This can be used to circumvent `RefCell`'s safety checks. + /// + /// This function is `unsafe` because `UnsafeCell`'s field is public. + #[inline] + #[experimental] + pub unsafe fn as_unsafe_cell<'a>(&'a self) -> &'a UnsafeCell { + &self.value + } } #[unstable = "waiting for `Clone` to become stable"] diff --git a/src/libcoretest/cell.rs b/src/libcoretest/cell.rs index b3ae110363cb5..59365045f4380 100644 --- a/src/libcoretest/cell.rs +++ b/src/libcoretest/cell.rs @@ -127,3 +127,22 @@ fn clone_ref_updates_flag() { } assert!(x.try_borrow_mut().is_some()); } + +#[test] +fn as_unsafe_cell() { + let c1: Cell = Cell::new(0u); + c1.set(1u); + assert_eq!(1u, unsafe { *c1.as_unsafe_cell().get() }); + + let c2: Cell = Cell::new(0u); + unsafe { *c2.as_unsafe_cell().get() = 1u; } + assert_eq!(1u, c2.get()); + + let r1: RefCell = RefCell::new(0u); + *r1.borrow_mut() = 1u; + assert_eq!(1u, unsafe { *r1.as_unsafe_cell().get() }); + + let r2: RefCell = RefCell::new(0u); + unsafe { *r2.as_unsafe_cell().get() = 1u; } + assert_eq!(1u, *r2.borrow()); +}