Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Flatten and cleanup ConstellationListener::is_cancelled.

Browse source
This commit is contained in:
Corey Farwell 2016-04-19 09:52:47 -04:00
parent 16be0640a8
commit a10b574d44
1 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
components/net/resource_thread.rs
View file

@ -227,17 +227,15 @@ impl CancellationListener {
}
pub fn is_cancelled(&self) -> bool {
match self.cancel_resource {
Some(ref resource) => {
match resource.cancel_receiver.try_recv() {
Ok(_) => {
self.cancel_status.set(true);
true
},
Err(_) => self.cancel_status.get(),
}
},
None => false, // channel doesn't exist!
let resource = match self.cancel_resource {
Some(ref resource) => resource,
None => return false, // channel doesn't exist!
};
if resource.cancel_receiver.try_recv().is_ok() {
self.cancel_status.set(true);
true
} else {
self.cancel_status.get()
}
}
}