@@ -7,7 +7,7 @@ export min_align_of;
7
7
export pref_align_of;
8
8
export refcount;
9
9
export log_str;
10
- export create_lock , lock_and_signal, condition, methods;
10
+ export lock_and_signal, condition, methods;
11
11
12
12
enum type_desc = {
13
13
first_param: * * libc:: c_int,
@@ -87,7 +87,9 @@ pure fn log_str<T>(t: T) -> str {
87
87
88
88
class lock_and_signal {
89
89
let lock : rust_cond_lock;
90
- new ( lock: rust_cond_lock) { self . lock = lock; }
90
+ new ( ) {
91
+ self . lock = rustrt:: rust_create_cond_lock ( ) ;
92
+ }
91
93
drop { rustrt : : rust_destroy_cond_lock ( self . lock ) ; }
92
94
}
93
95
@@ -101,10 +103,6 @@ class unlock {
101
103
drop { rustrt : : rust_unlock_cond_lock ( self . lock ) ; }
102
104
}
103
105
104
- fn create_lock ( ) -> lock_and_signal {
105
- lock_and_signal ( rustrt:: rust_create_cond_lock ( ) )
106
- }
107
-
108
106
impl methods for lock_and_signal {
109
107
unsafe fn lock < T > ( f : fn ( ) -> T ) -> T {
110
108
rustrt:: rust_lock_cond_lock ( self . lock ) ;
@@ -180,7 +178,7 @@ mod tests {
180
178
#[ test]
181
179
#[ ignore] // this can go into infinite loops
182
180
fn condition_variable ( ) {
183
- let lock = arc:: arc ( create_lock ( ) ) ;
181
+ let lock = arc:: arc ( lock_and_signal ( ) ) ;
184
182
let lock2 = arc:: clone ( & lock) ;
185
183
186
184
do task:: spawn |move lock2| {
0 commit comments