From 07477a4ba4a8669f5fa6e04d3b5323d61239aaf8 Mon Sep 17 00:00:00 2001 From: Sam Denty Date: Tue, 3 Jan 2023 15:49:39 +0000 Subject: [PATCH] cleanup --- src/icon/icon_info.rs | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/src/icon/icon_info.rs b/src/icon/icon_info.rs index f24e532..9059a79 100644 --- a/src/icon/icon_info.rs +++ b/src/icon/icon_info.rs @@ -94,42 +94,36 @@ impl IconInfo { } _ => { - match &url.path().split('.').last().unwrap_or("").to_lowercase()[..] { - "svg" => { - if let Some(sizes) = sizes { + if let Some(sizes) = &sizes { + match &url.path().split('.').last().unwrap_or("").to_lowercase()[..] { + "svg" => { return Ok(IconInfo::SVG { size: Some(*sizes.largest()), }); } - } - "png" => { - if let Some(sizes) = sizes { + "png" => { return Ok(IconInfo::PNG { size: *sizes.largest(), }); } - } - "jpeg" | "jpg" => { - if let Some(sizes) = sizes { + "jpeg" | "jpg" => { return Ok(IconInfo::JPEG { size: *sizes.largest(), }); } - } - "ico" => { - if let Some(sizes) = sizes { - return Ok(IconInfo::ICO { sizes }); + "ico" => { + return Ok(IconInfo::ICO { + sizes: sizes.clone(), + }); } - } - "gif" => { - if let Some(sizes) = sizes { + "gif" => { return Ok(IconInfo::GIF { size: *sizes.largest(), }); } - } - _ => {} - }; + _ => {} + }; + } let res = CLIENT.get(url).headers(headers).send().await?; if !res.status().is_success() {