servo: Merge #8388 - Use Result::ok in CompositorReceiver (from ucarion:ucarion-8386); r=frewsxcv

Fixes #8386

Source-Repo: https://github.com/servo/servo
Source-Revision: de2d14c971e21e8d8107b8ae5669408bee06f87b
This commit is contained in:
Ulysse Carion 2015-11-07 10:38:21 +05:01
parent dc4c0b1f0c
commit bfafea4bb6

View File

@ -48,10 +48,7 @@ pub trait CompositorReceiver : 'static {
/// A convenience implementation of `CompositorReceiver` for a plain old Rust `Receiver`.
impl CompositorReceiver for Receiver<Msg> {
fn try_recv_compositor_msg(&mut self) -> Option<Msg> {
match self.try_recv() {
Ok(msg) => Some(msg),
Err(_) => None,
}
self.try_recv().ok()
}
fn recv_compositor_msg(&mut self) -> Msg {
self.recv().unwrap()