From 79914e560f1ce4b1510fe4fa7971ec2109e9251e Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 12 Feb 2015 22:42:06 +0100 Subject: [PATCH 1/2] Cleanup join_layout a little bit. --- components/script/page.rs | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/components/script/page.rs b/components/script/page.rs index 55729fd3591..2d85f9db9b5 100644 --- a/components/script/page.rs +++ b/components/script/page.rs @@ -327,25 +327,23 @@ impl Page { /// layout task has finished any pending request messages. fn join_layout(&self) { let mut layout_join_port = self.layout_join_port.borrow_mut(); - if layout_join_port.is_some() { - let join_port = replace(&mut *layout_join_port, None); - match join_port { - Some(ref join_port) => { - match join_port.try_recv() { - Err(Empty) => { - info!("script: waiting on layout"); - join_port.recv().unwrap(); - } - Ok(_) => {} - Err(Disconnected) => { - panic!("Layout task failed while script was waiting for a result."); - } + let join_port = replace(&mut *layout_join_port, None); + match join_port { + Some(ref join_port) => { + match join_port.try_recv() { + Err(Empty) => { + info!("script: waiting on layout"); + join_port.recv().unwrap(); + } + Ok(_) => {} + Err(Disconnected) => { + panic!("Layout task failed while script was waiting for a result."); } - - debug!("script: layout joined") } - None => panic!("reader forked but no join port?"), + + debug!("script: layout joined") } + None => (), } } From a7154e1305d354a7745b23bf4583a9af1ab635dd Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 12 Feb 2015 23:56:38 +0100 Subject: [PATCH 2/2] Use if-let in join_layout. --- components/script/page.rs | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/components/script/page.rs b/components/script/page.rs index 2d85f9db9b5..b369a5e3337 100644 --- a/components/script/page.rs +++ b/components/script/page.rs @@ -327,23 +327,19 @@ impl Page { /// layout task has finished any pending request messages. fn join_layout(&self) { let mut layout_join_port = self.layout_join_port.borrow_mut(); - let join_port = replace(&mut *layout_join_port, None); - match join_port { - Some(ref join_port) => { - match join_port.try_recv() { - Err(Empty) => { - info!("script: waiting on layout"); - join_port.recv().unwrap(); - } - Ok(_) => {} - Err(Disconnected) => { - panic!("Layout task failed while script was waiting for a result."); - } + if let Some(join_port) = replace(&mut *layout_join_port, None) { + match join_port.try_recv() { + Err(Empty) => { + info!("script: waiting on layout"); + join_port.recv().unwrap(); + } + Ok(_) => {} + Err(Disconnected) => { + panic!("Layout task failed while script was waiting for a result."); } - - debug!("script: layout joined") } - None => (), + + debug!("script: layout joined") } }