From fec4b3c2358b2af4e4fec8e52cb46b4b3db5319a Mon Sep 17 00:00:00 2001 From: Carter Wobbe Date: Mon, 24 Mar 2025 16:58:32 -0700 Subject: [PATCH] config: Refactor WorkspaceLayout to use the Default macro --- cosmic-comp-config/src/workspace.rs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/cosmic-comp-config/src/workspace.rs b/cosmic-comp-config/src/workspace.rs index 2d4bf2dc..d72ed1c9 100644 --- a/cosmic-comp-config/src/workspace.rs +++ b/cosmic-comp-config/src/workspace.rs @@ -2,14 +2,10 @@ use serde::{Deserialize, Serialize}; -fn default_workspace_layout() -> WorkspaceLayout { - WorkspaceLayout::Vertical -} - #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] pub struct WorkspaceConfig { pub workspace_mode: WorkspaceMode, - #[serde(default = "default_workspace_layout")] + #[serde(default)] pub workspace_layout: WorkspaceLayout, } @@ -28,8 +24,9 @@ pub enum WorkspaceMode { Global, } -#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)] +#[derive(Debug, Clone, Copy, Default, PartialEq, Eq, Serialize, Deserialize)] pub enum WorkspaceLayout { + #[default] Vertical, Horizontal, }