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

Auto merge of #8388 - ucarion:ucarion-8386, r=frewsxcv

Browse source 
Use Result::ok in CompositorReceiver

Fixes #8386

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8388)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-11-07 11:07:21 +05:30
commit de2d14c971
1 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/compositing/compositor_task.rs
View file

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