From 74589043f72add79a048fa8ed96230817cdcde5b Mon Sep 17 00:00:00 2001 From: Lambda Date: Thu, 5 Sep 2024 18:50:44 +0000 Subject: [PATCH] Fix weird type gymnastics --- src/service/media.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/service/media.rs b/src/service/media.rs index 6185ad6e..a175f035 100644 --- a/src/service/media.rs +++ b/src/service/media.rs @@ -171,8 +171,8 @@ impl Service { / u64::from(original_height) }; if use_width { - if intermediate <= u64::from(::std::u32::MAX) { - (width, intermediate.try_into().unwrap_or(u32::MAX)) + if let Ok(intermediate) = u32::try_from(intermediate) { + (width, intermediate) } else { ( (u64::from(width) * u64::from(::std::u32::MAX) @@ -182,8 +182,8 @@ impl Service { ::std::u32::MAX, ) } - } else if intermediate <= u64::from(::std::u32::MAX) { - (intermediate.try_into().unwrap_or(u32::MAX), height) + } else if let Ok(intermediate) = u32::try_from(intermediate) { + (intermediate, height) } else { ( ::std::u32::MAX,