From 48eae39858a4926a0df0c011cff335b091c7394c Mon Sep 17 00:00:00 2001 From: Lysander Treumann Date: Tue, 21 Apr 2026 17:21:57 +0200 Subject: [PATCH] Incorporates format suggestions from 'cargo fmt --all --check', Improves error messages when PageInner.size is unexpectedly None --- cosmic-settings/src/pages/desktop/panel/inner.rs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/cosmic-settings/src/pages/desktop/panel/inner.rs b/cosmic-settings/src/pages/desktop/panel/inner.rs index d6b7574..bcd7bb3 100644 --- a/cosmic-settings/src/pages/desktop/panel/inner.rs +++ b/cosmic-settings/src/pages/desktop/panel/inner.rs @@ -209,7 +209,9 @@ pub(crate) fn style< text::body(fl!("small")).into(), slider( 0..=4, - match inner.size.as_ref().expect("inner.size is None even though inner.panel_config is Some") { + match inner.size.as_ref().expect( + "PageInner.size is None even though PageInner.panel_config is Some", + ) { PanelSize::XS => 0, PanelSize::S => 1, PanelSize::M => 2, @@ -606,7 +608,13 @@ impl PageInner { self.size = Some(size); } Message::PanelSizeCommit => { - _ = panel_config.set_size(helper, self.size.as_ref().expect("PageInner.size is None even though it should be Some").clone()); + _ = panel_config.set_size( + helper, + self.size + .as_ref() + .expect("PageInner.size is None even though it should be Some, since PageInner.panel_config is Some") + .clone() + ); // Reset any size overrides the user might have set _ = panel_config.set_size_center(helper, None); _ = panel_config.set_size_wings(helper, None);