From aa32edd4ca8fc1aecd16460f05c471e91dea26d3 Mon Sep 17 00:00:00 2001 From: Diggory Hardy Date: Sat, 8 Oct 2022 18:36:06 +0100 Subject: [PATCH] rustfmt: single_line_if_else_max_width = 60 --- .rustfmt.toml | 1 + crates/kas-theme/src/flat_theme.rs | 6 +----- crates/kas-theme/src/shaded_theme.rs | 6 +----- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/.rustfmt.toml b/.rustfmt.toml index da3cc14f0..b65407d7b 100644 --- a/.rustfmt.toml +++ b/.rustfmt.toml @@ -3,5 +3,6 @@ inline_attribute_width = 60 overflow_delimited_expr = true +single_line_if_else_max_width = 60 use_field_init_shorthand = true use_try_shorthand = true diff --git a/crates/kas-theme/src/flat_theme.rs b/crates/kas-theme/src/flat_theme.rs index 3d425ddfd..34e21ac6a 100644 --- a/crates/kas-theme/src/flat_theme.rs +++ b/crates/kas-theme/src/flat_theme.rs @@ -197,11 +197,7 @@ where b = b * SHADOW_HOVER; } let shadow_outer = Quad::from_coords(a + inner.a, b + inner.b); - let col1 = if self.cols.is_dark { - col_frame - } else { - Rgba::BLACK - }; + let col1 = if self.cols.is_dark { col_frame } else { Rgba::BLACK }; let mut col2 = col1; col2.a = 0.0; self.draw diff --git a/crates/kas-theme/src/shaded_theme.rs b/crates/kas-theme/src/shaded_theme.rs index 491ae0c9c..0632e7a2a 100644 --- a/crates/kas-theme/src/shaded_theme.rs +++ b/crates/kas-theme/src/shaded_theme.rs @@ -186,11 +186,7 @@ where } let outer_col = self.cols.background; - let inner_col = if nav_focus { - self.cols.accent_soft - } else { - outer_col - }; + let inner_col = if nav_focus { self.cols.accent_soft } else { outer_col }; self.draw .shaded_square_frame(outer, inner, NORMS_SUNK, outer_col, inner_col);