From 1e52e59d2a792fc461c987735b3fa4432eea8910 Mon Sep 17 00:00:00 2001
From: mautam <mautam@usa.com>
Date: Sat, 17 Feb 2024 20:20:47 +0000
Subject: [PATCH] chore: correct cargo clippies, formatting

---
 Cargo.toml                               | 3 ++-
 leftwm-layouts/src/geometry/direction.rs | 8 ++++----
 leftwm-layouts/src/lib.rs                | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index a6528da..49eb3ce 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,3 +1,4 @@
 [workspace]
 members = ["leftwm-layouts", "demo", "demo-ascii"]
-default-members = ["leftwm-layouts"]
\ No newline at end of file
+default-members = ["leftwm-layouts"]
+resolver = "2"
diff --git a/leftwm-layouts/src/geometry/direction.rs b/leftwm-layouts/src/geometry/direction.rs
index 9302793..a48198b 100644
--- a/leftwm-layouts/src/geometry/direction.rs
+++ b/leftwm-layouts/src/geometry/direction.rs
@@ -61,7 +61,7 @@ pub enum Direction {
 // Find the north neighbor starting from a given `Rect` with index `current` in an array of
 // [`Rect`].
 fn find_north(rects: &[Rect], current: usize) -> Option<usize> {
-    let Some(current_rect) = rects.get(current).or(None) else { return None };
+    let current_rect = rects.get(current).or(None)?;
 
     // We are all the way up, no neighbor available
     if current_rect.top_edge() <= 0 {
@@ -102,7 +102,7 @@ fn find_north(rects: &[Rect], current: usize) -> Option<usize> {
 // Find the east neighbor starting from a given `Rect` with index `current` in an array of
 // [`Rect`].
 fn find_east(rects: &[Rect], current: usize, display_width: u32) -> Option<usize> {
-    let Some(current_rect) = rects.get(current).or(None) else { return None };
+    let current_rect = rects.get(current).or(None)?;
 
     // We are all the way right, no neighbor available
     if current_rect.right_edge() >= display_width as i32 {
@@ -143,7 +143,7 @@ fn find_east(rects: &[Rect], current: usize, display_width: u32) -> Option<usize
 // Find the south neighbor starting from a given `Rect` with index `current` in an array of
 // [`Rect`].
 fn find_south(rects: &[Rect], current: usize, display_height: u32) -> Option<usize> {
-    let Some(current_rect) = rects.get(current).or(None) else { return None };
+    let current_rect = rects.get(current).or(None)?;
 
     // We are at the bottom, no neighbor available
     if current_rect.y + current_rect.h as i32 >= display_height as i32 {
@@ -185,7 +185,7 @@ fn find_south(rects: &[Rect], current: usize, display_height: u32) -> Option<usi
 // Find the west neighbor starting from a given `Rect` with index `current` in an array of
 // [`Rect`].
 fn find_west(rects: &[Rect], current: usize) -> Option<usize> {
-    let Some(current_rect) = rects.get(current).or(None) else { return None };
+    let current_rect = rects.get(current).or(None)?;
 
     // We are all the way left; no neighbor available
     if current_rect.left_edge() <= 0 {
diff --git a/leftwm-layouts/src/lib.rs b/leftwm-layouts/src/lib.rs
index 51cc983..f322a87 100644
--- a/leftwm-layouts/src/lib.rs
+++ b/leftwm-layouts/src/lib.rs
@@ -142,7 +142,7 @@ fn stack_main_stack(
 
     // copy rotated/flipped columns into the variables
     let non_empty = |rect: &&Rect| rect.surface_area() > 0;
-    left_column = columns.get(0).filter(non_empty).copied();
+    left_column = columns.first().filter(non_empty).copied();
     main_column = columns.get(1).filter(non_empty).copied();
     right_column = columns.get(2).filter(non_empty).copied();