style: linting fixes

glzr-io · Aug 2, 2024 · 03c3afb · 03c3afb
1 parent 50a6560
commit 03c3afb
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 46 deletions.
diff --git a/packages/wm/Cargo.toml b/packages/wm/Cargo.toml
@@ -24,7 +24,7 @@ tauri-winres = { workspace = true }
 [dependencies]
 anyhow = { workspace = true }
 clap = { version = "4", features = ["derive"] }
-ambassador = "0.4.1"
+ambassador = "0.4"
 enum-as-inner = "0.6"
 futures-util = "0.3"
 home = "0.5"

diff --git a/packages/wm/src/containers/container.rs b/packages/wm/src/containers/container.rs
@@ -23,7 +23,7 @@ use crate::{
 };
 
 /// A container of any type.
-#[derive(Clone, Debug, EnumAsInner, Delegate)] // <-------
+#[derive(Clone, Debug, EnumAsInner, Delegate)]
 #[delegate(CommonGetters)]
 #[delegate(PositionGetters)]
 pub enum Container {
@@ -35,21 +35,42 @@ pub enum Container {
   NonTilingWindow(NonTilingWindow),
 }
 
-impl From<SplitContainer> for Container{
-  fn from(value: SplitContainer) -> Self {
-    Container::Split(value)
+impl From<RootContainer> for Container {
+  fn from(value: RootContainer) -> Self {
+    Container::Root(value)
+  }
+}
+
+impl From<Monitor> for Container {
+  fn from(value: Monitor) -> Self {
+    Container::Monitor(value)
   }
 }
+
 impl From<Workspace> for Container {
   fn from(value: Workspace) -> Self {
     Container::Workspace(value)
   }
 }
-impl From<RootContainer> for Container{
-  fn from(value: RootContainer) -> Self {
-    Container::Root(value)
+
+impl From<SplitContainer> for Container {
+  fn from(value: SplitContainer) -> Self {
+    Container::Split(value)
+  }
+}
+
+impl From<NonTilingWindow> for Container {
+  fn from(value: NonTilingWindow) -> Self {
+    Container::NonTilingWindow(value)
+  }
+}
+
+impl From<TilingWindow> for Container {
+  fn from(value: TilingWindow) -> Self {
+    Container::TilingWindow(value)
   }
 }
+
 impl From<TilingContainer> for Container {
   fn from(tiling_container: TilingContainer) -> Self {
     match tiling_container {
@@ -98,13 +119,13 @@ pub enum TilingContainer {
   TilingWindow(TilingWindow),
 }
 
-impl From<SplitContainer> for TilingContainer{
+impl From<SplitContainer> for TilingContainer {
   fn from(value: SplitContainer) -> Self {
     TilingContainer::Split(value)
   }
 }
 
-impl From<TilingWindow> for TilingContainer{
+impl From<TilingWindow> for TilingContainer {
   fn from(value: TilingWindow) -> Self {
     TilingContainer::TilingWindow(value)
   }
@@ -143,34 +164,17 @@ pub enum WindowContainer {
   NonTilingWindow(NonTilingWindow),
 }
 
-impl From<TilingWindow> for WindowContainer{
+impl From<TilingWindow> for WindowContainer {
   fn from(value: TilingWindow) -> Self {
     WindowContainer::TilingWindow(value)
   }
 }
 
-impl From<NonTilingWindow> for WindowContainer{
+impl From<NonTilingWindow> for WindowContainer {
   fn from(value: NonTilingWindow) -> Self {
     WindowContainer::NonTilingWindow(value)
   }
 }
-impl From<NonTilingWindow> for Container {
-  fn from(value: NonTilingWindow) -> Self {
-    Container::NonTilingWindow(value)
-  }
-}
-
-impl From<Monitor> for Container {
-  fn from(value: Monitor) -> Self {
-    Container::Monitor(value)
-  }
-}
-
-impl From<TilingWindow> for Container{
-  fn from(value: TilingWindow) -> Self {
-    Container::TilingWindow(value)
-  }
-}
 
 impl TryFrom<Container> for WindowContainer {
   type Error = &'static str;
@@ -220,18 +224,18 @@ pub enum DirectionContainer {
   Split(SplitContainer),
 }
 
-impl From<SplitContainer> for DirectionContainer{
-  fn from(value: SplitContainer) -> Self {
-    DirectionContainer::Split(value)
-  }
-}
-
 impl From<Workspace> for DirectionContainer {
   fn from(value: Workspace) -> Self {
     DirectionContainer::Workspace(value)
   }
 }
 
+impl From<SplitContainer> for DirectionContainer {
+  fn from(value: SplitContainer) -> Self {
+    DirectionContainer::Split(value)
+  }
+}
+
 impl TryFrom<Container> for DirectionContainer {
   type Error = &'static str;
 

diff --git a/packages/wm/src/containers/traits/common_getters.rs b/packages/wm/src/containers/traits/common_getters.rs
@@ -2,16 +2,16 @@ use std::{
   cell::{Ref, RefMut},
   collections::VecDeque,
 };
+
 use ambassador::delegatable_trait;
 use uuid::Uuid;
 
 use crate::{
   containers::{
-    Container, ContainerDto, DirectionContainer, RootContainer,
-    SplitContainer, TilingContainer, WindowContainer,
+    Container, ContainerDto, DirectionContainer, TilingContainer,
+    WindowContainer,
   },
   monitors::Monitor,
-  windows::{NonTilingWindow, TilingWindow},
   workspaces::Workspace,
 };
 

diff --git a/packages/wm/src/containers/traits/position_getters.rs b/packages/wm/src/containers/traits/position_getters.rs
@@ -1,11 +1,6 @@
 use ambassador::delegatable_trait;
 
-use crate::{
-  common::Rect,
-  containers::{
-    Container, DirectionContainer, TilingContainer, WindowContainer,
-  },
-};
+use crate::common::Rect;
 
 #[delegatable_trait]
 pub trait PositionGetters {

diff --git a/packages/wm/src/containers/traits/tiling_direction_getters.rs b/packages/wm/src/containers/traits/tiling_direction_getters.rs
@@ -1,8 +1,9 @@
 use ambassador::delegatable_trait;
+
 use super::CommonGetters;
 use crate::{
   common::{Direction, TilingDirection},
-  containers::{DirectionContainer, TilingContainer},
+  containers::TilingContainer,
   windows::TilingWindow,
 };
 

diff --git a/packages/wm/src/windows/traits/window_getters.rs b/packages/wm/src/windows/traits/window_getters.rs
@@ -1,10 +1,11 @@
 use std::cell::Ref;
+
 use ambassador::delegatable_trait;
+
 use crate::{
   common::{
     platform::NativeWindow, DisplayState, LengthValue, Rect, RectDelta,
   },
-  containers::WindowContainer,
   user_config::{UserConfig, WindowRuleConfig},
   windows::{active_drag::ActiveDrag, WindowState},
 };