From d628e8029942916053b3b7e72d363b1290fc5711 Mon Sep 17 00:00:00 2001 From: Jack Wills <32690432+mrjackwills@users.noreply.github.com> Date: Thu, 30 Mar 2023 02:28:53 +0000 Subject: [PATCH] refactor: popup() use `saturating_x()` rather than `checked_x()` --- src/ui/draw_blocks.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/ui/draw_blocks.rs b/src/ui/draw_blocks.rs index 341b33b..25ed869 100644 --- a/src/ui/draw_blocks.rs +++ b/src/ui/draw_blocks.rs @@ -11,7 +11,7 @@ use ratatui::{ }, Frame, }; -use std::default::Default; +use std::{default::Default, ops::Sub}; use std::{fmt::Display, sync::Arc}; use crate::app_data::{Header, SortedOrder}; @@ -898,9 +898,7 @@ pub fn info(f: &mut Frame<'_, B>, text: String) { fn popup(text_lines: usize, text_width: usize, r: Rect, box_location: BoxLocation) -> Rect { // Make sure blank_space can't be an negative, as will crash let calc = |x: u16, y: usize| { - (usize::from(x).checked_sub(y).map_or(1usize, |f| f)) - .checked_div(2) - .map_or(1usize, |f| f) + usize::from(x).saturating_sub(y).saturating_div(2) }; let blank_vertical = calc(r.height, text_lines);