From 3985e33b439c8d36836705ac72853ae010f29b42 Mon Sep 17 00:00:00 2001 From: Raphael Nestler Date: Sat, 7 Nov 2015 16:06:17 +0100 Subject: [PATCH 1/2] Use while let{} instead of loop{match{}} --- components/compositing/compositor.rs | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs index f92bb55c54c..d265112ae82 100644 --- a/components/compositing/compositor.rs +++ b/components/compositing/compositor.rs @@ -2125,14 +2125,9 @@ fn find_layer_with_pipeline_and_layer_id_for_layer(layer: Rc CompositorEventListener for IOCompositor where Window: WindowMethods { fn handle_events(&mut self, messages: Vec) -> bool { // Check for new messages coming from the other tasks in the system. - loop { - match self.port.try_recv_compositor_msg() { - None => break, - Some(msg) => { - if !self.handle_browser_message(msg) { - break - } - } + while let Some(msg) = self.port.try_recv_compositor_msg() { + if !self.handle_browser_message(msg) { + break } } From 39aa3cfc2ab7e3266d725556df4f4ca7c1bf61b1 Mon Sep 17 00:00:00 2001 From: Raphael Nestler Date: Sat, 7 Nov 2015 16:21:33 +0100 Subject: [PATCH 2/2] Use while let{} instead of loop{match{}} in ScrollingTimer::run() --- components/compositing/scrolling.rs | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/components/compositing/scrolling.rs b/components/compositing/scrolling.rs index df266f1741e..c4f4be7804c 100644 --- a/components/compositing/scrolling.rs +++ b/components/compositing/scrolling.rs @@ -54,16 +54,11 @@ impl ScrollingTimerProxy { impl ScrollingTimer { pub fn run(&mut self) { - loop { - match self.receiver.recv() { - Ok(ToScrollingTimerMsg::ScrollEventProcessedMsg(timestamp)) => { - let target = timestamp as i64 + TIMEOUT; - let delta_ns = target - (time::precise_time_ns() as i64); - sleep_ms((delta_ns / 1000000) as u32); - self.compositor_proxy.send(Msg::ScrollTimeout(timestamp)); - } - Ok(ToScrollingTimerMsg::ExitMsg) | Err(_) => break, - } + while let Ok(ToScrollingTimerMsg::ScrollEventProcessedMsg(timestamp)) = self.receiver.recv() { + let target = timestamp as i64 + TIMEOUT; + let delta_ns = target - (time::precise_time_ns() as i64); + sleep_ms((delta_ns / 1000000) as u32); + self.compositor_proxy.send(Msg::ScrollTimeout(timestamp)); } } }