From 2e16c3ca8a68493434e8a191069fc7ff337a3126 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Tue, 6 Oct 2015 18:10:48 +0200 Subject: [PATCH 1/2] Avoid an unnecessary unwrap() call in handle_take_screenshot. --- components/webdriver_server/lib.rs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/components/webdriver_server/lib.rs b/components/webdriver_server/lib.rs index 22776126a94..ecead687c1f 100644 --- a/components/webdriver_server/lib.rs +++ b/components/webdriver_server/lib.rs @@ -615,12 +615,13 @@ impl Handler { sleep_ms(interval) } - if img.is_none() { - return Err(WebDriverError::new(ErrorStatus::Timeout, - "Taking screenshot timed out")); - } + let mut img = match img { + Some(img) => img, + None => return Err(WebDriverError::new(ErrorStatus::Timeout, + "Taking screenshot timed out")), + }; - let img_vec = match png::to_vec(&mut img.unwrap()) { + let img_vec = match png::to_vec(&mut img) { Ok(x) => x, Err(_) => return Err(WebDriverError::new(ErrorStatus::UnknownError, "Taking screenshot failed")) From 0f6197a0fd77c6799f784ec06608a6307ce615e0 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Tue, 6 Oct 2015 18:13:22 +0200 Subject: [PATCH 2/2] Fix incorrect indentation in handle_take_screenshot. --- components/webdriver_server/lib.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/webdriver_server/lib.rs b/components/webdriver_server/lib.rs index ecead687c1f..c00f36c070a 100644 --- a/components/webdriver_server/lib.rs +++ b/components/webdriver_server/lib.rs @@ -622,9 +622,9 @@ impl Handler { }; let img_vec = match png::to_vec(&mut img) { - Ok(x) => x, - Err(_) => return Err(WebDriverError::new(ErrorStatus::UnknownError, - "Taking screenshot failed")) + Ok(x) => x, + Err(_) => return Err(WebDriverError::new(ErrorStatus::UnknownError, + "Taking screenshot failed")) }; let config = Config { char_set: CharacterSet::Standard,