From 773e88197183fa3fedfd72ef65ba31e4e86b9d12 Mon Sep 17 00:00:00 2001 From: Oluwatobi Sofela <60105594+oluwatobiss@users.noreply.github.com> Date: Wed, 27 Mar 2024 17:16:48 +0100 Subject: [PATCH] clippy: Fix unnecessary_lazy_evaluations warnings (#31898) --- components/gfx/platform/windows/font.rs | 2 +- components/script/dom/mediafragmentparser.rs | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/components/gfx/platform/windows/font.rs b/components/gfx/platform/windows/font.rs index 73d6687ffc8..3ec4c73ecf8 100644 --- a/components/gfx/platform/windows/font.rs +++ b/components/gfx/platform/windows/font.rs @@ -237,7 +237,7 @@ impl FontHandleMethods for FontHandle { None => { let bytes = template.bytes(); let font_file = - FontFile::new_from_data(bytes).ok_or_else(|| "Could not create FontFile")?; + FontFile::new_from_data(bytes).ok_or("Could not create FontFile")?; let face = font_file .create_face(0, dwrote::DWRITE_FONT_SIMULATIONS_NONE) .map_err(|_| "Could not create FontFace")?; diff --git a/components/script/dom/mediafragmentparser.rs b/components/script/dom/mediafragmentparser.rs index c416ab29222..a41951c1a4f 100644 --- a/components/script/dom/mediafragmentparser.rs +++ b/components/script/dom/mediafragmentparser.rs @@ -300,11 +300,7 @@ fn parse_hms(s: &str) -> Result { let result = match vec.len() { 1 => { - let secs = vec - .pop_front() - .ok_or_else(|| ())? - .parse::() - .map_err(|_| ())?; + let secs = vec.pop_front().ok_or(())?.parse::().map_err(|_| ())?; if secs == 0. { return Err(()); @@ -318,7 +314,7 @@ fn parse_hms(s: &str) -> Result { parse_npt_seconds(vec.pop_front().ok_or(())?)?, ), 3 => hms_to_seconds( - vec.pop_front().ok_or_else(|| ())?.parse().map_err(|_| ())?, + vec.pop_front().ok_or(())?.parse().map_err(|_| ())?, parse_npt_minute(vec.pop_front().ok_or(())?)?, parse_npt_seconds(vec.pop_front().ok_or(())?)?, ),