bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

librustc: Implement write guards for borrowing @mut to & or &mut. r=nmatsakis

Browse source
This commit is contained in:
Patrick Walton 2013-01-11 21:01:42 -08:00
parent 8bde2c1d65
commit f405e41d7a
38 changed files with 522 additions and 365 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/libstd/arc.rs
View file

@ -430,9 +430,9 @@ impl<T: Const Owned> &RWWriteMode<T> {
/// Access the pre-downgrade RWARC in write mode.
fn write<U>(blk: fn(x: &mut T) -> U) -> U {
match *self {
RWWriteMode((data, ref token, _)) => {
RWWriteMode((ref data, ref token, _)) => {
do token.write {
blk(data)
blk(&mut **data)
}
}
}
@ -440,12 +440,14 @@ impl<T: Const Owned> &RWWriteMode<T> {
/// Access the pre-downgrade RWARC in write mode with a condvar.
fn write_cond<U>(blk: fn(x: &x/mut T, c: &c/Condvar) -> U) -> U {
match *self {
RWWriteMode((data, ref token, ref poison)) => {
RWWriteMode((ref data, ref token, ref poison)) => {
do token.write_cond |cond| {
let cvar = Condvar {
is_mutex: false, failed: poison.failed,
cond: cond };
blk(data, &cvar)
is_mutex: false,
failed: &mut *poison.failed,
cond: cond
};
blk(&mut **data, &cvar)
}
}
}