nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 23:04:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix incorrect region code based on the old 'self

Browse Source 
also removes unnecessary casts from the RcMut implementation
This commit is contained in:
Daniel Micay 2013-05-08 15:03:39 -04:00
parent b21f37c818
commit 044abef0e5
3 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
doc/tutorial-ffi.md
View File

@ -157,7 +157,7 @@ pub struct Unique<T> {
priv ptr: *mut T priv ptr: *mut T
} }
pub impl<'self, T: Owned> Unique<T> { pub impl<T: Owned> Unique<T> {
fn new(value: T) -> Unique<T> { fn new(value: T) -> Unique<T> {
unsafe { unsafe {
let ptr = malloc(core::sys::size_of::<T>() as size_t) as *mut T; let ptr = malloc(core::sys::size_of::<T>() as size_t) as *mut T;
@ -168,14 +168,14 @@ pub impl<'self, T: Owned> Unique<T> {
} }
} }
// the 'self lifetime results in the same semantics as `&*x` with ~T // the 'r lifetime results in the same semantics as `&*x` with ~T
fn borrow(&self) -> &'self T { fn borrow<'r>(&'r self) -> &'r T {
unsafe { cast::transmute(self.ptr) } unsafe { cast::copy_lifetime(self, &*self.ptr) }
} }
// the 'self lifetime results in the same semantics as `&mut *x` with ~T // the 'r lifetime results in the same semantics as `&mut *x` with ~T
fn borrow_mut(&mut self) -> &'self mut T { fn borrow_mut<'r>(&'r mut self) -> &'r mut T {
unsafe { cast::transmute(self.ptr) } unsafe { cast::copy_mut_lifetime(self, &mut *self.ptr) }
} }
} }

6
src/libcore/cast.rs
View File

@ -108,6 +108,12 @@ pub unsafe fn copy_lifetime<'a,S,T>(_ptr: &'a S, ptr: &T) -> &'a T {
transmute_region(ptr) transmute_region(ptr)
} }
/// Transforms lifetime of the second pointer to match the first.
#[inline(always)]
pub unsafe fn copy_mut_lifetime<'a,S,T>(_ptr: &'a mut S, ptr: &mut T) -> &'a mut T {
transmute_mut_region(ptr)
}
/// Transforms lifetime of the second pointer to match the first. /// Transforms lifetime of the second pointer to match the first.
#[inline(always)] #[inline(always)]
pub unsafe fn copy_lifetime_vec<'a,S,T>(_ptr: &'a [S], ptr: &T) -> &'a T { pub unsafe fn copy_lifetime_vec<'a,S,T>(_ptr: &'a [S], ptr: &T) -> &'a T {

12
src/libstd/rc.rs
View File

@ -29,7 +29,7 @@ pub struct Rc<T> {
priv ptr: *mut RcBox<T>, priv ptr: *mut RcBox<T>,
} }
pub impl<'self, T: Owned> Rc<T> { pub impl<T: Owned> Rc<T> {
fn new(value: T) -> Rc<T> { fn new(value: T) -> Rc<T> {
unsafe { unsafe {
let ptr = malloc(sys::size_of::<RcBox<T>>() as size_t) as *mut RcBox<T>; let ptr = malloc(sys::size_of::<RcBox<T>>() as size_t) as *mut RcBox<T>;
@ -40,8 +40,8 @@ pub impl<'self, T: Owned> Rc<T> {
} }
#[inline(always)] #[inline(always)]
fn borrow(&self) -> &'self T { fn borrow<'r>(&'r self) -> &'r T {
unsafe { cast::transmute_region(&(*self.ptr).value) } unsafe { cast::copy_lifetime(self, &(*self.ptr).value) }
} }
} }
@ -119,7 +119,7 @@ pub struct RcMut<T> {
priv ptr: *mut RcMutBox<T>, priv ptr: *mut RcMutBox<T>,
} }
pub impl<'self, T: Owned> RcMut<T> { pub impl<T: Owned> RcMut<T> {
fn new(value: T) -> RcMut<T> { fn new(value: T) -> RcMut<T> {
unsafe { unsafe {
let ptr = malloc(sys::size_of::<RcMutBox<T>>() as size_t) as *mut RcMutBox<T>; let ptr = malloc(sys::size_of::<RcMutBox<T>>() as size_t) as *mut RcMutBox<T>;
@ -136,7 +136,7 @@ pub impl<'self, T: Owned> RcMut<T> {
assert!((*self.ptr).borrow != Mutable); assert!((*self.ptr).borrow != Mutable);
let previous = (*self.ptr).borrow; let previous = (*self.ptr).borrow;
(*self.ptr).borrow = Immutable; (*self.ptr).borrow = Immutable;
f(cast::transmute_region(&(*self.ptr).value)); f(&(*self.ptr).value);
(*self.ptr).borrow = previous; (*self.ptr).borrow = previous;
} }
} }
@ -147,7 +147,7 @@ pub impl<'self, T: Owned> RcMut<T> {
unsafe { unsafe {
assert!((*self.ptr).borrow == Nothing); assert!((*self.ptr).borrow == Nothing);
(*self.ptr).borrow = Mutable; (*self.ptr).borrow = Mutable;
f(cast::transmute_mut_region(&mut (*self.ptr).value)); f(&mut (*self.ptr).value);
(*self.ptr).borrow = Nothing; (*self.ptr).borrow = Nothing;
} }
} }