From 0cec0677393a08632e52bb0c81c04d04dd72168f Mon Sep 17 00:00:00 2001
From: elkowar <5300871+elkowar@users.noreply.github.com>
Date: Wed, 16 Aug 2023 15:55:38 +0200
Subject: [PATCH] Even morer more cleanup

---
 crates/eww/src/display_backend.rs                |  4 ++--
 crates/yuck/src/config/attributes.rs             |  1 -
 crates/yuck/src/config/backend_window_options.rs | 12 +++++++-----
 crates/yuck/src/config/widget_definition.rs      |  2 +-
 crates/yuck/src/config/window_geometry.rs        |  2 ++
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/crates/eww/src/display_backend.rs b/crates/eww/src/display_backend.rs
index 7f6f86d8..f544b6e7 100644
--- a/crates/eww/src/display_backend.rs
+++ b/crates/eww/src/display_backend.rs
@@ -189,8 +189,8 @@ mod platform_x11 {
             let mon_end_y = scale_factor * (monitor_rect.y() + monitor_rect.height()) as u32 - 1u32;
 
             let dist = match strut_def.side {
-                Side::Left | Side::Right => strut_def.dist.pixels_relative_to(monitor_rect.width()) as u32,
-                Side::Top | Side::Bottom => strut_def.dist.pixels_relative_to(monitor_rect.height()) as u32,
+                Side::Left | Side::Right => strut_def.distance.pixels_relative_to(monitor_rect.width()) as u32,
+                Side::Top | Side::Bottom => strut_def.distance.pixels_relative_to(monitor_rect.height()) as u32,
             };
 
             // don't question it,.....
diff --git a/crates/yuck/src/config/attributes.rs b/crates/yuck/src/config/attributes.rs
index 0b469d92..15639a54 100644
--- a/crates/yuck/src/config/attributes.rs
+++ b/crates/yuck/src/config/attributes.rs
@@ -110,7 +110,6 @@ impl Attributes {
     }
 }
 
-
 /// Specification of an argument to a widget or window
 #[derive(Debug, PartialEq, Eq, Clone, serde::Serialize)]
 pub struct AttrSpec {
diff --git a/crates/yuck/src/config/backend_window_options.rs b/crates/yuck/src/config/backend_window_options.rs
index a78168c8..1314664a 100644
--- a/crates/yuck/src/config/backend_window_options.rs
+++ b/crates/yuck/src/config/backend_window_options.rs
@@ -29,7 +29,8 @@ pub enum Error {
     EvalError(#[from] EvalError),
 }
 
-/// Backend-specific options of a window that are backend
+/// Backend-specific options of a window
+/// Unevaluated form of [`BackendWindowOptions`]
 #[derive(Clone, Debug, Eq, PartialEq, serde::Serialize)]
 pub struct BackendWindowOptionsDef {
     pub wayland: WlBackendWindowOptionsDef,
@@ -194,10 +195,11 @@ impl std::str::FromStr for Side {
     }
 }
 
+/// Unevaluated form of [`X11StrutDefinition`]
 #[derive(Debug, Clone, PartialEq, Eq, serde::Serialize)]
 pub struct X11StrutDefinitionExpr {
     pub side: Option<SimplExpr>,
-    pub dist: SimplExpr,
+    pub distance: SimplExpr,
 }
 
 impl X11StrutDefinitionExpr {
@@ -207,7 +209,7 @@ impl X11StrutDefinitionExpr {
                 Some(expr) => Side::from_dynval(&expr.eval(local_variables)?)?,
                 None => Side::default(),
             },
-            dist: NumWithUnit::from_dynval(&self.dist.eval(local_variables)?)?,
+            distance: NumWithUnit::from_dynval(&self.distance.eval(local_variables)?)?,
         })
     }
 }
@@ -218,12 +220,12 @@ impl FromAstElementContent for X11StrutDefinitionExpr {
     fn from_tail<I: Iterator<Item = Ast>>(_span: Span, mut iter: AstIterator<I>) -> DiagResult<Self> {
         let mut attrs = iter.expect_key_values()?;
         iter.expect_done().map_err(DiagError::from).note("Check if you are missing a colon in front of a key")?;
-        Ok(X11StrutDefinitionExpr { side: attrs.ast_optional("side")?, dist: attrs.ast_required("distance")? })
+        Ok(X11StrutDefinitionExpr { side: attrs.ast_optional("side")?, distance: attrs.ast_required("distance")? })
     }
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Default, serde::Serialize)]
 pub struct X11StrutDefinition {
     pub side: Side,
-    pub dist: NumWithUnit,
+    pub distance: NumWithUnit,
 }
diff --git a/crates/yuck/src/config/widget_definition.rs b/crates/yuck/src/config/widget_definition.rs
index d06ea8a2..093db778 100644
--- a/crates/yuck/src/config/widget_definition.rs
+++ b/crates/yuck/src/config/widget_definition.rs
@@ -10,7 +10,7 @@ use crate::{
 };
 use eww_shared_util::{Span, Spanned};
 
-use super::{widget_use::WidgetUse, attributes::AttrSpec};
+use super::{attributes::AttrSpec, widget_use::WidgetUse};
 
 #[derive(Debug, PartialEq, Eq, Clone, serde::Serialize)]
 pub struct WidgetDefinition {
diff --git a/crates/yuck/src/config/window_geometry.rs b/crates/yuck/src/config/window_geometry.rs
index e0b0a323..07b221d6 100644
--- a/crates/yuck/src/config/window_geometry.rs
+++ b/crates/yuck/src/config/window_geometry.rs
@@ -109,6 +109,7 @@ impl std::str::FromStr for AnchorPoint {
     }
 }
 
+/// Unevaluated variant of [`Coords`]
 #[derive(Clone, Debug, Eq, PartialEq, Serialize)]
 pub struct CoordsDef {
     pub x: Option<SimplExpr>,
@@ -144,6 +145,7 @@ fn convert_to_num_with_unit(
     })
 }
 
+/// Unevaluated variant of [`WindowGeometry`]
 #[derive(Clone, Debug, Eq, PartialEq, Serialize)]
 pub struct WindowGeometryDef {
     pub anchor_point: Option<SimplExpr>,