From 8e9d7a1e91754d82a30eeb620fba43fab6c5d4be Mon Sep 17 00:00:00 2001
From: Ashley Wulber <ashley@system76.com>
Date: Mon, 20 Jun 2022 16:15:19 -0400
Subject: [PATCH] cleanup

---
 Cargo.lock                                      |  2 +-
 applets/cosmic-applet-workspaces/src/wayland.rs | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b462569a..a3f3bc9f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -428,7 +428,7 @@ dependencies = [
 [[package]]
 name = "cosmic-panel-config"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/cosmic-panel/#231dc1ec0656840458d9f0d3468d9c7ea5c2a98c"
+source = "git+https://github.com/pop-os/cosmic-panel#231dc1ec0656840458d9f0d3468d9c7ea5c2a98c"
 dependencies = [
  "anyhow",
  "gtk4",
diff --git a/applets/cosmic-applet-workspaces/src/wayland.rs b/applets/cosmic-applet-workspaces/src/wayland.rs
index 2f77681b..705d495d 100644
--- a/applets/cosmic-applet-workspaces/src/wayland.rs
+++ b/applets/cosmic-applet-workspaces/src/wayland.rs
@@ -5,7 +5,10 @@ use crate::{
 };
 use cosmic_panel_config::config::CosmicPanelConfig;
 use gtk4::glib;
-use std::{env, mem, os::unix::net::UnixStream, path::PathBuf, sync::Arc, time::Duration, collections::HashMap, hash::Hash};
+use std::{
+    collections::HashMap, env, hash::Hash, mem, os::unix::net::UnixStream, path::PathBuf,
+    sync::Arc, time::Duration,
+};
 use tokio::sync::mpsc;
 use wayland_backend::client::ObjectData;
 use wayland_client::{
@@ -47,11 +50,9 @@ use self::generated::client::{
     zext_workspace_handle_v1::{self, ZextWorkspaceHandleV1},
 };
 
-// TODO check panel config to find which output we are on and ignore outputs which are different
-
 pub fn spawn_workspaces(tx: glib::Sender<State>) -> mpsc::Sender<WorkspaceEvent> {
     let (workspaces_tx, mut workspaces_rx) = mpsc::channel(100);
-    
+
     if let Ok(Ok(conn)) = std::env::var("HOST_WAYLAND_DISPLAY")
         .map_err(anyhow::Error::msg)
         .map(|display_str| {
@@ -65,7 +66,9 @@ pub fn spawn_workspaces(tx: glib::Sender<State>) -> mpsc::Sender<WorkspaceEvent>
         .and_then(|s| s.map(|s| Connection::from_socket(s).map_err(anyhow::Error::msg)))
     {
         std::thread::spawn(move || {
-            let output = CosmicPanelConfig::load_from_env().unwrap_or_default().output;
+            let output = CosmicPanelConfig::load_from_env()
+                .unwrap_or_default()
+                .output;
             let mut event_loop = calloop::EventLoop::<State>::try_new().unwrap();
             let loop_handle = event_loop.handle();
             let event_queue = conn.new_event_queue::<State>();
@@ -275,7 +278,6 @@ impl Dispatch<ZextWorkspaceGroupHandleV1, ()> for State {
     ) {
         match event {
             zext_workspace_group_handle_v1::Event::OutputEnter { output } => {
-
                 if let Some(group) = self
                     .workspace_groups
                     .iter_mut()