From cada9e4c677c9bd347bee4496080530939a5a456 Mon Sep 17 00:00:00 2001 From: MegaBrutal Date: Sun, 17 Jul 2022 20:15:00 +0200 Subject: [PATCH] Refactor /pgen/1 to avoid drop & return --- src/main.rs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main.rs b/src/main.rs index 2931365..302fb3a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -221,14 +221,13 @@ async fn img_pgen1(req: HttpRequest, path: web::Path<(u32, u32, u32)>, canvas1: let canvas = canvas_option.take().unwrap_or_else( || Canvas::new(dim_x, dim_y) ); if (dim_x, dim_y) == canvas.img.dimensions() { let canvas = rgb_encode_to_canvas(canvas, percent_decode_str(&data).into_iter().borrow_mut())?; - canvas_option.insert(canvas).img.clone() + Ok(canvas_option.insert(canvas).img.clone()) } else { - canvas_option.insert(canvas); - drop(canvas_option); - return Err(CanvasError::DimensionMismatch)? + _ = canvas_option.insert(canvas); + Err(CanvasError::DimensionMismatch) } - }; + }?; let (tdim_x, tdim_y) = img.dimensions(); let (tdim_x, tdim_y) = (tdim_x * scale, tdim_y * scale); let img = resize(&img, tdim_x, tdim_y, FilterType::Nearest); -- 2.34.1