remove comp and ord for ComponentEntry as it seemed to be unused

Author: togglebyte

CHANGES.md

@@ -1,6 +1,8 @@
 * 0.2.10
     * BUGFIX: `on_mount` is now called after the children are generated
     * BUGFIX: `on_tick` is now run before the cycle call 
+    * BUGFIX: `expand` would make the constraints tight, this is no longer the
+      case
 * 0.2.9
     * New function: truncate
     * New border style: "rounded"

Cargo.toml

@@ -11,6 +11,7 @@ documentation = "https://togglebyte.github.io/anathema-guide/"
 homepage = "https://github.com/togglebyte/anathema"
 repository = "https://github.com/togglebyte/anathema"
 publish = true
+rust-version = "1.88"
 
 [dependencies]
 anathema-backend = { workspace = true }
@@ -83,6 +84,7 @@ should_implement_trait = "allow"
 type_complexity = "allow"
 too_many_arguments = "allow"
 wrong_self_convention = "allow"
+collapsible_if = "allow"
 
 [package.metadata.release]
 shared-version = true

anathema-default-widgets/src/layout/expand.rs

@@ -85,14 +85,14 @@ pub fn layout_all_expansions<'bp>(
                 let mut constraints = Constraints::new(sub_size, constraints.max_height());
 
                 // Ensure that the rounding doesn't push the constraint outside of the max width
-                constraints.min_width = constraints.max_width();
+                constraints.min_width = constraints.min_width.min(constraints.max_width());
                 constraints
             }
             Axis::Vertical => {
                 let mut constraints = Constraints::new(constraints.max_width(), sub_size);
 
                 // Ensure that the rounding doesn't push the constraint outside of the max height
-                constraints.min_height = constraints.max_height();
+                constraints.min_height = constraints.min_height.min(constraints.max_height());
                 constraints
             }
         };

anathema-widgets/src/nodes/eval.rs

@@ -303,9 +303,7 @@ impl Evaluator for ComponentEval {
             .ok_or_else(|| ctx.error(ErrorKind::TreeTransactionFailed))?;
         ctx.new_components.push((widget_id, state_id));
 
-        let path = tree.path(widget_id);
-        ctx.components
-            .push(path, component_id, widget_id, state_id, accept_ticks);
+        ctx.components.push(component_id, widget_id, state_id, accept_ticks);
 
         Ok(())
     }

anathema-widgets/src/widget/mod.rs

@@ -1,5 +1,4 @@
 use std::any::Any;
-use std::cmp::Ordering;
 use std::fmt::{self, Debug};
 use std::ops::ControlFlow;
 
@@ -39,27 +38,6 @@ pub struct CompEntry {
     pub accept_ticks: bool,
 
     component_id: ComponentBlueprintId,
-    path: Box<[u16]>,
-}
-
-impl PartialOrd for CompEntry {
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        Some(self.path.cmp(&other.path))
-    }
-}
-
-impl Ord for CompEntry {
-    fn cmp(&self, other: &Self) -> Ordering {
-        self.path.cmp(&other.path)
-    }
-}
-
-impl Eq for CompEntry {}
-
-impl PartialEq for CompEntry {
-    fn eq(&self, other: &Self) -> bool {
-        self.path.eq(&other.path)
-    }
 }
 
 /// Store a list of components currently in the tree
@@ -74,14 +52,12 @@ impl Components {
 
     pub fn push(
         &mut self,
-        path: Box<[u16]>,
         component_id: ComponentBlueprintId,
         widget_id: WidgetId,
         state_id: StateId,
         accept_ticks: bool,
     ) {
         let entry = CompEntry {
-            path,
             component_id,
             widget_id,
             state_id,