Give up on not implementing Eq and Ord

src/geom/angle.rs

@@ -2,7 +2,7 @@ use super::*;
 use decorum::N64;
 
 /// An angle.
-#[derive(Default, Copy, Clone, PartialEq, PartialOrd, Hash)]
+#[derive(Default, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
 pub struct Angle {
     /// The angle in raw units.
     raw: N64,

src/geom/fr.rs

@@ -3,7 +3,7 @@ use decorum::N64;
 use super::*;
 
 /// A fractional length.
-#[derive(Default, Copy, Clone, PartialEq, PartialOrd, Hash)]
+#[derive(Default, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
 pub struct Fractional(N64);
 
 impl Fractional {

src/geom/linear.rs

@@ -1,7 +1,7 @@
 use super::*;
 
 /// A combined relative and absolute length.
-#[derive(Default, Copy, Clone, PartialEq, Hash)]
+#[derive(Default, Copy, Clone, Eq, PartialEq, Hash)]
 pub struct Linear {
     /// The relative part.
     pub rel: Relative,

src/geom/path.rs

@@ -3,12 +3,12 @@ use super::*;
 use serde::{Deserialize, Serialize};
 
 /// A bezier path.
-#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[derive(Default, Debug, Clone, Eq, PartialEq, Serialize, Deserialize)]
 #[serde(transparent)]
 pub struct Path(pub Vec<PathElement>);
 
 /// An element in a bezier path.
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[derive(Debug, Clone, Eq, PartialEq, Serialize, Deserialize)]
 pub enum PathElement {
     MoveTo(Point),
     LineTo(Point),

src/geom/point.rs

@@ -3,7 +3,7 @@ use super::*;
 use serde::{Deserialize, Serialize};
 
 /// A point in 2D.
-#[derive(Default, Copy, Clone, PartialEq, Serialize, Deserialize, Hash)]
+#[derive(Default, Copy, Clone, Eq, PartialEq, Hash, Serialize, Deserialize)]
 pub struct Point {
     /// The x coordinate.
     pub x: Length,

src/geom/relative.rs

@@ -6,7 +6,7 @@ use super::*;
 ///
 /// _Note_: `50%` is represented as `0.5` here, but stored as `50.0` in the
 /// corresponding [literal](crate::syntax::Expr::Percent).
-#[derive(Default, Copy, Clone, PartialEq, PartialOrd, Hash)]
+#[derive(Default, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
 pub struct Relative(N64);
 
 impl Relative {

src/geom/size.rs

@@ -3,7 +3,7 @@ use super::*;
 use serde::{Deserialize, Serialize};
 
 /// A size in 2D.
-#[derive(Default, Copy, Clone, PartialEq, Serialize, Deserialize, Hash)]
+#[derive(Default, Copy, Clone, Eq, PartialEq, Hash, Serialize, Deserialize)]
 pub struct Size {
     /// The width.
     pub width: Length,

src/layout/stack.rs

@@ -39,6 +39,7 @@ impl From<StackNode> for AnyNode {
     }
 }
 
+#[derive(Debug)]
 struct StackLayouter<'a> {
     /// The directions of the stack.
     stack: &'a StackNode,

tests/typeset.rs

@@ -350,12 +350,7 @@ fn draw(cache: &Cache, frames: &[Frame], dpi: f32) -> Pixmap {
     let pad = Length::pt(5.0);
 
     let height = pad + frames.iter().map(|l| l.size.height + pad).sum::<Length>();
-    let width = 2.0 * pad
+    let width = 2.0 * pad + frames.iter().map(|l| l.size.width).max().unwrap_or_default();
-        + frames
-            .iter()
-            .map(|l| l.size.width)
-            .max_by(|a, b| a.partial_cmp(&b).unwrap())
-            .unwrap_or_default();
 
     let pixel_width = (dpi * width.to_pt() as f32) as u32;
     let pixel_height = (dpi * height.to_pt() as f32) as u32;