@@ -326,7 +326,7 @@ impl Sem<~[WaitQueue]> {
326
326
// and rwlock_write_mode.
327
327
pub fn access_cond < U > ( & self , blk: |c: & Condvar | -> U ) -> U {
328
328
do self . access {
329
- blk ( & Condvar { sem : self , order : Nothing , token : NonCopyable :: new ( ) } )
329
+ blk ( & Condvar { sem : self , order : Nothing , token : NonCopyable } )
330
330
}
331
331
}
332
332
}
@@ -569,7 +569,7 @@ impl RWLock {
569
569
do task:: rekillable {
570
570
let opt_lock = Just ( & self . order_lock ) ;
571
571
blk ( & Condvar { sem : cond. sem , order : opt_lock,
572
- token : NonCopyable :: new ( ) } )
572
+ token : NonCopyable } )
573
573
}
574
574
}
575
575
}
@@ -605,7 +605,7 @@ impl RWLock {
605
605
( & self . order_lock ) . release ( ) ;
606
606
do ( || {
607
607
do task:: rekillable {
608
- blk( RWLockWriteMode { lock : self , token : NonCopyable :: new ( ) } )
608
+ blk( RWLockWriteMode { lock : self , token : NonCopyable } )
609
609
}
610
610
} ) . finally {
611
611
let writer_or_last_reader;
@@ -662,7 +662,7 @@ impl RWLock {
662
662
}
663
663
}
664
664
}
665
- RWLockReadMode { lock : token. lock , token : NonCopyable :: new ( ) }
665
+ RWLockReadMode { lock : token. lock , token : NonCopyable }
666
666
}
667
667
}
668
668
@@ -682,7 +682,7 @@ impl<'self> RWLockWriteMode<'self> {
682
682
// access lock. See comment in RWLock::write_cond for why.
683
683
blk ( & Condvar { sem : & self . lock . access_lock ,
684
684
order : Just ( & self . lock . order_lock ) ,
685
- token : NonCopyable :: new ( ) } )
685
+ token : NonCopyable } )
686
686
}
687
687
}
688
688
0 commit comments