@@ -59,7 +59,7 @@ pub struct Task {
59
59
}
60
60
61
61
pub enum TaskType {
62
- GreenTask ( Option < ~ SchedHome > ) ,
62
+ GreenTask ( Option < SchedHome > ) ,
63
63
SchedTask
64
64
}
65
65
@@ -173,7 +173,7 @@ impl Task {
173
173
name : None ,
174
174
coroutine : Some ( Coroutine :: new ( stack_pool, stack_size, start) ) ,
175
175
sched : None ,
176
- task_type : GreenTask ( Some ( ~ home) ) ,
176
+ task_type : GreenTask ( Some ( home) ) ,
177
177
borrow_list : None
178
178
}
179
179
}
@@ -196,15 +196,15 @@ impl Task {
196
196
name : None ,
197
197
coroutine : Some ( Coroutine :: new ( stack_pool, stack_size, start) ) ,
198
198
sched : None ,
199
- task_type : GreenTask ( Some ( ~ home) ) ,
199
+ task_type : GreenTask ( Some ( home) ) ,
200
200
borrow_list : None
201
201
}
202
202
}
203
203
204
204
pub fn give_home ( & mut self , new_home : SchedHome ) {
205
205
match self . task_type {
206
206
GreenTask ( ref mut home) => {
207
- * home = Some ( ~ new_home) ;
207
+ * home = Some ( new_home) ;
208
208
}
209
209
SchedTask => {
210
210
rtabort ! ( "type error: used SchedTask as GreenTask" ) ;
@@ -216,7 +216,7 @@ impl Task {
216
216
match self . task_type {
217
217
GreenTask ( ref mut home) => {
218
218
let out = home. take_unwrap ( ) ;
219
- return * out;
219
+ return out;
220
220
}
221
221
SchedTask => {
222
222
rtabort ! ( "type error: used SchedTask as GreenTask" ) ;
@@ -275,8 +275,8 @@ impl Task {
275
275
276
276
pub fn is_home_no_tls ( & self , sched : & ~Scheduler ) -> bool {
277
277
match self . task_type {
278
- GreenTask ( Some ( ~ AnySched ) ) => { false }
279
- GreenTask ( Some ( ~ Sched ( SchedHandle { sched_id : ref id, _} ) ) ) => {
278
+ GreenTask ( Some ( AnySched ) ) => { false }
279
+ GreenTask ( Some ( Sched ( SchedHandle { sched_id : ref id, _} ) ) ) => {
280
280
* id == sched. sched_id ( )
281
281
}
282
282
GreenTask ( None ) => {
@@ -291,8 +291,8 @@ impl Task {
291
291
292
292
pub fn homed ( & self ) -> bool {
293
293
match self . task_type {
294
- GreenTask ( Some ( ~ AnySched ) ) => { false }
295
- GreenTask ( Some ( ~ Sched ( SchedHandle { _ } ) ) ) => { true }
294
+ GreenTask ( Some ( AnySched ) ) => { false }
295
+ GreenTask ( Some ( Sched ( SchedHandle { _ } ) ) ) => { true }
296
296
GreenTask ( None ) => {
297
297
rtabort ! ( "task without home" ) ;
298
298
}
@@ -309,11 +309,11 @@ impl Task {
309
309
let sched_id = task. sched . get_ref ( ) . sched_id ( ) ;
310
310
let sched_run_anything = task. sched . get_ref ( ) . run_anything ;
311
311
match task. task_type {
312
- GreenTask ( Some ( ~ AnySched ) ) => {
312
+ GreenTask ( Some ( AnySched ) ) => {
313
313
rtdebug ! ( "anysched task in sched check ****" ) ;
314
314
sched_run_anything
315
315
}
316
- GreenTask ( Some ( ~ Sched ( SchedHandle { sched_id : ref id, _ } ) ) ) => {
316
+ GreenTask ( Some ( Sched ( SchedHandle { sched_id : ref id, _ } ) ) ) => {
317
317
rtdebug ! ( "homed task in sched check ****" ) ;
318
318
* id == sched_id
319
319
}
0 commit comments