auto merge of #2646 : Manishearth/servo/cleartimeout-opt, r=jdm

This commit is contained in:
bors-servo 2014-06-13 08:10:57 -04:00
commit 58b776e0b5

View file

@ -61,7 +61,7 @@ impl Hash for TimerId {
impl TimerHandle {
fn cancel(&mut self) {
self.cancel_chan.as_ref().map(|chan| chan.send(()));
self.cancel_chan.as_ref().map(|chan| chan.send_opt(()).ok());
}
}