From d3eb8d5ad0b3d390fab5af0ce3e9667fb976a043 Mon Sep 17 00:00:00 2001 From: Daniel Eades Date: Sun, 14 Apr 2024 21:08:03 +0100 Subject: [PATCH] use 'clamp' function (clippy::manual_clamp) --- src/terminal_box.rs | 2 +- src/terminal_theme.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/terminal_box.rs b/src/terminal_box.rs index 48056c4..da6e88b 100644 --- a/src/terminal_box.rs +++ b/src/terminal_box.rs @@ -364,7 +364,7 @@ where if !metadata.flags.is_empty() { let style_line_height = - (self.glyph_font_size / 10.0).max(2.0).min(16.0); + (self.glyph_font_size / 10.0).clamp(2.0, 16.0); let line_color = cosmic_text_to_iced_color(metadata.underline_color); diff --git a/src/terminal_theme.rs b/src/terminal_theme.rs index a2e1b80..8df1dff 100644 --- a/src/terminal_theme.rs +++ b/src/terminal_theme.rs @@ -55,8 +55,8 @@ impl ColorDerive { fn color_adj(rgb: Rgb, saturation_adj: f32, lightness_adj: f32) -> Rgb { let mut okhsl = Self::rgb_to_okhsl(rgb); - okhsl.saturation = (okhsl.saturation + saturation_adj).max(0.0).min(1.0); - okhsl.lightness = (okhsl.lightness + lightness_adj).max(0.0).min(1.0); + okhsl.saturation = (okhsl.saturation + saturation_adj).clamp(0.0, 1.0); + okhsl.lightness = (okhsl.lightness + lightness_adj).clamp(0.0, 1.0); Self::okhsl_to_rgb(okhsl) }