From e9af66488893f6854ae432914b62954b5d7cb816 Mon Sep 17 00:00:00 2001 From: "daniel.eades" Date: Thu, 16 Nov 2023 18:20:57 +0000 Subject: [PATCH] flatten tautological enum names --- cosmic-app-list/src/app.rs | 6 ++--- cosmic-app-list/src/wayland_handler.rs | 16 +++++------ cosmic-app-list/src/wayland_subscription.rs | 6 ++--- cosmic-applet-graphics/src/window.rs | 30 +++++++++------------ 4 files changed, 27 insertions(+), 31 deletions(-) diff --git a/cosmic-app-list/src/app.rs b/cosmic-app-list/src/app.rs index a55c2615..c032e519 100755 --- a/cosmic-app-list/src/app.rs +++ b/cosmic-app-list/src/app.rs @@ -722,7 +722,7 @@ impl cosmic::Application for CosmicAppList { .map(cosmic::app::message::app); } WaylandUpdate::Toplevel(event) => match event { - ToplevelUpdate::AddToplevel(handle, info) => { + ToplevelUpdate::Add(handle, info) => { if info.app_id.is_empty() { return Command::none(); } @@ -747,7 +747,7 @@ impl cosmic::Application for CosmicAppList { }); } } - ToplevelUpdate::RemoveToplevel(handle) => { + ToplevelUpdate::Remove(handle) => { for t in self .active_list .iter_mut() @@ -757,7 +757,7 @@ impl cosmic::Application for CosmicAppList { } self.active_list.retain(|t| !t.toplevels.is_empty()); } - ToplevelUpdate::UpdateToplevel(handle, info) => { + ToplevelUpdate::Update(handle, info) => { // TODO probably want to make sure it is removed if info.app_id.is_empty() { return Command::none(); diff --git a/cosmic-app-list/src/wayland_handler.rs b/cosmic-app-list/src/wayland_handler.rs index 28d4b31f..33a44d7a 100644 --- a/cosmic-app-list/src/wayland_handler.rs +++ b/cosmic-app-list/src/wayland_handler.rs @@ -135,7 +135,7 @@ impl ToplevelInfoHandler for AppData { if let Some(info) = self.toplevel_info_state.info(toplevel) { let _ = self .tx - .unbounded_send(WaylandUpdate::Toplevel(ToplevelUpdate::AddToplevel( + .unbounded_send(WaylandUpdate::Toplevel(ToplevelUpdate::Add( toplevel.clone(), info.clone(), ))); @@ -149,12 +149,12 @@ impl ToplevelInfoHandler for AppData { toplevel: &zcosmic_toplevel_handle_v1::ZcosmicToplevelHandleV1, ) { if let Some(info) = self.toplevel_info_state.info(toplevel) { - let _ = - self.tx - .unbounded_send(WaylandUpdate::Toplevel(ToplevelUpdate::UpdateToplevel( - toplevel.clone(), - info.clone(), - ))); + let _ = self + .tx + .unbounded_send(WaylandUpdate::Toplevel(ToplevelUpdate::Update( + toplevel.clone(), + info.clone(), + ))); } } @@ -166,7 +166,7 @@ impl ToplevelInfoHandler for AppData { ) { let _ = self .tx - .unbounded_send(WaylandUpdate::Toplevel(ToplevelUpdate::RemoveToplevel( + .unbounded_send(WaylandUpdate::Toplevel(ToplevelUpdate::Remove( toplevel.clone(), ))); } diff --git a/cosmic-app-list/src/wayland_subscription.rs b/cosmic-app-list/src/wayland_subscription.rs index 5faad3ad..da9123cb 100644 --- a/cosmic-app-list/src/wayland_subscription.rs +++ b/cosmic-app-list/src/wayland_subscription.rs @@ -82,9 +82,9 @@ pub enum WaylandUpdate { #[derive(Clone, Debug)] pub enum ToplevelUpdate { - AddToplevel(ZcosmicToplevelHandleV1, ToplevelInfo), - UpdateToplevel(ZcosmicToplevelHandleV1, ToplevelInfo), - RemoveToplevel(ZcosmicToplevelHandleV1), + Add(ZcosmicToplevelHandleV1, ToplevelInfo), + Update(ZcosmicToplevelHandleV1, ToplevelInfo), + Remove(ZcosmicToplevelHandleV1), } #[derive(Clone, Debug)] diff --git a/cosmic-applet-graphics/src/window.rs b/cosmic-applet-graphics/src/window.rs index c149ab27..60967ccd 100644 --- a/cosmic-applet-graphics/src/window.rs +++ b/cosmic-applet-graphics/src/window.rs @@ -22,17 +22,17 @@ const ID: &str = "com.system76.CosmicAppletGraphics"; #[derive(Clone, Copy)] enum GraphicsMode { - AppliedGraphicsMode(Graphics), - SelectedGraphicsMode { prev: Graphics, new: Graphics }, - CurrentGraphicsMode(Graphics), + Applied(Graphics), + Selected { prev: Graphics, new: Graphics }, + Current(Graphics), } impl GraphicsMode { fn inner(&self) -> Graphics { match self { - GraphicsMode::SelectedGraphicsMode { new, .. } => *new, - GraphicsMode::CurrentGraphicsMode(g) => *g, - GraphicsMode::AppliedGraphicsMode(g) => *g, + GraphicsMode::Selected { new, .. } => *new, + GraphicsMode::Current(g) => *g, + GraphicsMode::Applied(g) => *g, } } } @@ -98,7 +98,7 @@ impl cosmic::Application for Window { .graphics_mode .map(|m| m.inner()) .unwrap_or_else(|| Graphics::Integrated); - self.graphics_mode = Some(GraphicsMode::SelectedGraphicsMode { prev, new }); + self.graphics_mode = Some(GraphicsMode::Selected { prev, new }); return iced::Command::perform( set_graphics(proxy.clone(), new), move |success| { @@ -157,9 +157,7 @@ impl cosmic::Application for Window { Message::CurrentGraphics(g) => { if let Some(g) = g { self.graphics_mode = Some(match self.graphics_mode.take() { - Some(GraphicsMode::CurrentGraphicsMode(_)) | None => { - GraphicsMode::CurrentGraphicsMode(g) - } + Some(GraphicsMode::Current(_)) | None => GraphicsMode::Current(g), Some(g) => g, }); } @@ -171,13 +169,13 @@ impl cosmic::Application for Window { } Message::AppliedGraphics(g) => { if let Some(g) = g { - self.graphics_mode = Some(GraphicsMode::AppliedGraphicsMode(g)); + self.graphics_mode = Some(GraphicsMode::Applied(g)); } else { // Reset graphics match self.graphics_mode { - Some(GraphicsMode::SelectedGraphicsMode { prev, new }) => { + Some(GraphicsMode::Selected { prev, new }) => { // TODO send notification with error? - self.graphics_mode = Some(GraphicsMode::AppliedGraphicsMode(prev)); + self.graphics_mode = Some(GraphicsMode::Applied(prev)); // Reset to prev after failing // https://github.com/pop-os/system76-power/issues/387 if let Some((_, proxy)) = self.dbus.as_ref() { @@ -342,7 +340,7 @@ fn button_icon<'a>( button_mode: Graphics, ) -> Container<'a, Message, cosmic::Renderer> { match cur_mode { - Some(GraphicsMode::SelectedGraphicsMode { prev: _, new }) if new == button_mode => { + Some(GraphicsMode::Selected { prev: _, new }) if new == button_mode => { cosmic::widget::container( icon::from_name("process-working-symbolic") .size(12) @@ -350,9 +348,7 @@ fn button_icon<'a>( .prefer_svg(true), ) } - Some(GraphicsMode::AppliedGraphicsMode(g) | GraphicsMode::CurrentGraphicsMode(g)) - if g == button_mode => - { + Some(GraphicsMode::Applied(g) | GraphicsMode::Current(g)) if g == button_mode => { cosmic::widget::container( icon::from_name("emblem-ok-symbolic") .size(12)