Skip to content

Commit 889df62

Browse files
committed
---
yaml --- r: 88800 b: refs/heads/snap-stage3 c: 2490b59 h: refs/heads/master v: v3
1 parent c40ffd8 commit 889df62

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: deeca5d586bfaa4aa60246f671a8d611d38f6248
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 7a1e486b2acbf86a5768ab6cc05ff0eca8af3e1f
4+
refs/heads/snap-stage3: 2490b59da0c13818346890dac087238532df59a2
55
refs/heads/try: b160761e35efcd1207112b3b782c06633cf441a8
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libextra/arc.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ use std::borrow;
5151
/// As sync::condvar, a mechanism for unlock-and-descheduling and signaling.
5252
pub struct Condvar<'a> {
5353
priv is_mutex: bool,
54-
priv failed: &'a mut bool,
54+
priv failed: &'a bool,
5555
priv cond: &'a sync::Condvar<'a>
5656
}
5757

@@ -242,7 +242,7 @@ impl<T:Send> MutexArc<T> {
242242
let _z = PoisonOnFail::new(&mut (*state).failed);
243243
blk(&mut (*state).data,
244244
&Condvar {is_mutex: true,
245-
failed: &mut (*state).failed,
245+
failed: &(*state).failed,
246246
cond: cond })
247247
})
248248
}
@@ -414,7 +414,7 @@ impl<T:Freeze + Send> RWArc<T> {
414414
let _z = PoisonOnFail::new(&mut (*state).failed);
415415
blk(&mut (*state).data,
416416
&Condvar {is_mutex: false,
417-
failed: &mut (*state).failed,
417+
failed: &(*state).failed,
418418
cond: cond})
419419
})
420420
}
@@ -567,7 +567,7 @@ impl<'a, T:Freeze + Send> RWWriteMode<'a, T> {
567567
unsafe {
568568
let cvar = Condvar {
569569
is_mutex: false,
570-
failed: &mut *poison.flag,
570+
failed: &*poison.flag,
571571
cond: cond
572572
};
573573
blk(data, &cvar)

0 commit comments

Comments
 (0)