Skip to content

Commit 6481148

Browse files
committed
---
yaml --- r: 151894 b: refs/heads/try2 c: d49aef7 h: refs/heads/master v: v3
1 parent 33fda4f commit 6481148

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 84378b0b5af9ec09ce627fdd59353b408d7f7fb4
8+
refs/heads/try2: d49aef7c024dba42fe9e440c06065235fa8a73f7
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libstd/unstable/sync.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
use alloc::arc::Arc;
12+
1113
use clone::Clone;
1214
use kinds::Send;
13-
use sync::arc::UnsafeArc;
15+
use ty::Unsafe;
1416
use unstable::mutex::NativeMutex;
1517

1618
struct ExData<T> {
@@ -30,7 +32,7 @@ struct ExData<T> {
3032
* need to block or deschedule while accessing shared state, use extra::sync::RWArc.
3133
*/
3234
pub struct Exclusive<T> {
33-
x: UnsafeArc<ExData<T>>
35+
x: Arc<Unsafe<ExData<T>>>
3436
}
3537

3638
impl<T:Send> Clone for Exclusive<T> {
@@ -48,7 +50,7 @@ impl<T:Send> Exclusive<T> {
4850
data: user_data
4951
};
5052
Exclusive {
51-
x: UnsafeArc::new(data)
53+
x: Arc::new(Unsafe::new(data))
5254
}
5355
}
5456

0 commit comments

Comments
 (0)